diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2021-08-31 08:59:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 08:59:27 +0200 |
| commit | 506b411dfc43229633ce0a4680334ed7ef6e5e5d (patch) | |
| tree | 285f00b9768afce3ad8a630c948fd91caf5aa798 | |
| parent | 71c9f4c8d50275959b5bc5670109d99da12683bb (diff) | |
| parent | 07ccccecad473fef8f622689855d6aa0fdbf16ed (diff) | |
| download | nextcloud-server-506b411dfc43229633ce0a4680334ed7ef6e5e5d.tar.gz nextcloud-server-506b411dfc43229633ce0a4680334ed7ef6e5e5d.zip | |
Merge pull request #28332 from nextcloud/work/carl/argon2i2
Only recommand for php-sodium on >= PHP 7.4
| -rw-r--r-- | apps/settings/lib/Controller/CheckSetupController.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 21b05d98979..3e239c15c1b 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -627,7 +627,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'; } |