Merge pull request #28332 from nextcloud/work/carl/argon2i2

ChristophWurst · web-flow · commit 506b411dfc43 · 2021-08-31T08:59:27.000+02:00
Only recommand for php-sodium on &gt;= PHP 7.4
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -627,7 +627,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';
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,11 @@ protected function hasRecommendedPHPModules(): array {`
`627`	`627`	`}`
`628`	`628`	`}`
`629`	`629`
`630`		`- if (!defined('PASSWORD_ARGON2I')) {`
	`630`	`+ if (!defined('PASSWORD_ARGON2I') && PHP_VERSION_ID >= 70400) {`
	`631`	`+ // Installing php-sodium on >=php7.4 will provide PASSWORD_ARGON2I`
	`632`	`+ // on previous version argon2 wasn't part of the "standard" extension`
	`633`	`+ // and RedHat disabled it so even installing php-sodium won't provide argon2i`
	`634`	`+ // support in password_hash/password_verify.`
`631`	`635`	`$recommendedPHPModules[] = 'sodium';`
`632`	`636`	`}`
`633`	`637`