Updated CHANGELOG to reflect the changes since 4.5.0

[jirafeau_project.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index ec348cdd301f4b4014e19605f1c5ed61c9f2825c..e3399fd937c1c4cc25e1da8c69dc4fd1fc6ccc64 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -79,16 +79,18 @@ define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
 
 // Define some Sodium constants from newer PHP versions if they are not available
 
 
 // Define some Sodium constants from newer PHP versions if they are not available
 

-if (!defined('SSODIUM_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);
+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
 }
 
 // set UTC as default timezone for all date/time functions