From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Wed, 3 Apr 2024 12:21:33 +0000 (+0200)
Subject: Define constants only if Sodium is available
X-Git-Tag: 4.6.0~14^2~5
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/d80bc81c62a4775758a3c97e6506a9d26014b75e?ds=inline;hp=--cc

Define constants only if Sodium is available
---

d80bc81c62a4775758a3c97e6506a9d26014b75e
diff --git a/lib/settings.php b/lib/settings.php
index ec348cd..7449dc6 100644
--- 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
 
-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('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);
+    }
 }
 
 // set UTC as default timezone for all date/time functions