upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

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

Browse source 
[stable20] Only recommand for php-sodium on >= PHP 7.4
This commit is contained in:
MichaIng 2021-08-31 11:57:46 +02:00 committed by GitHub
commit 3c7f6429b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/settings/lib/Controller/CheckSetupController.php
View file

@ -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';
}