From d80bc81c62a4775758a3c97e6506a9d26014b75e Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Wed, 3 Apr 2024 14:21:33 +0200 Subject: [PATCH 1/1] Define constants only if Sodium is available --- lib/settings.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 -- 2.34.1