Merged next-release into master

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 7ecee3a5062ce3e8b152f9ccfa262ee0085c0d90..e3399fd937c1c4cc25e1da8c69dc4fd1fc6ccc64 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -77,5 +77,21 @@ define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
 
 define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
 
+// Define some Sodium constants from newer PHP versions if they are not available
+
+if (extension_loaded('sodium')) {
+    if (!defined('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES')) {
+        define('SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES', 32);
+    }
+
+    if (!defined('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES')) {
+        define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES', 24);
+    }
+
+    if (!defined('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES')) {
+        define('SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES', 17);
+    }
+}
+
 // set UTC as default timezone for all date/time functions
 date_default_timezone_set('UTC');