Merge pull request #28655 from nextcloud/backport/28332/stable20

[stable20] Only recommand for php-sodium on >= PHP 7.4
nextcloud · Aug 31, 2021 · 3c7f642 · 3c7f642
2 parents 66c65d4 + 33cfc99
commit 3c7f642
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -621,7 +621,11 @@ protected function hasRecommendedPHPModules(): array {
 			}
 		}
 
-		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';
 		}