diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-05-01 16:39:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 16:39:13 +0300 |
| commit | 8c023a657983924ab5a81c94837dd66d9892d168 (patch) | |
| tree | e4eb0ee2d9015bc9c461b6253ea5f33f4e13718e /lib | |
| parent | 91487d87395819a6fa052440bd582ae54abd41a0 (diff) | |
| parent | 229570badfa9cef0b395e3fd55a251ff39d0ed12 (diff) | |
Merge pull request #20767 from nextcloud/enh/argon2id-options
Apply Argon2 options for Argon2id hashing as well
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Security/Hasher.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php index 2ed21e7e427..a51508ba8e9 100644 --- a/lib/private/Security/Hasher.php +++ b/lib/private/Security/Hasher.php @@ -65,7 +65,7 @@ class Hasher implements IHasher { public function __construct(IConfig $config) { $this->config = $config; - if (\defined('PASSWORD_ARGON2I')) { + if (\defined('PASSWORD_ARGON2ID') || \defined('PASSWORD_ARGON2I')) { // password_hash fails, when the minimum values are undershot. // In this case, apply minimum. $this->options['threads'] = max($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS), 1); |