From 33cfc996b7eecd0acef9103b5279dbf11c2017cd Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 6 Aug 2021 14:22:09 +0200 Subject: [PATCH] Only recommand for php-sodium on >= PHP 7.4 This is because php-sodium will solve the missing PASSWORD_ARGON2I constant problem only on >= php 7.4, previously argon2 wasn't part of the standard extension and was disabled on Centos/RHEL. So installing php-sodium on php 7.2 for example wouldn't hide the message. Tested on Fedora with php 7.4, Centos 7 with php 7.2, Centos 8 with php 7.2 and openSUSE with php 7.4. Signed-off-by: Carl Schwan --- apps/settings/lib/Controller/CheckSetupController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index fc3fde65fe0..1df8dda9897 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -621,7 +621,11 @@ Raw output } } - if (!defined('PASSWORD_ARGON2I')) { + if (!defined('PASSWORD_ARGON2I') && PHP_VERSION_ID >= 70400) { + // Installing php-sodium on >=php7.4 will provide PASSWORD_ARGON2I + // on previous version argon2 wasn't part of the "standard" extension + // and RedHat disabled it so even installing php-sodium won't provide argon2i + // support in password_hash/password_verify. $recommendedPHPModules[] = 'sodium'; } -- 2.39.5