diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-05-01 14:43:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 14:43:26 +0200 |
| commit | de43edca3b3e7694eb3116d8aec9858b3c469b18 (patch) | |
| tree | 2f7ad83cf201b320b84ee1c706c7ac9c8bcb5492 /lib | |
| parent | 78dbf5df85b563664f532957df972b2185942d11 (diff) | |
| parent | e5f1523577dc027621092d95166f20fcee95cf96 (diff) | |
| download | nextcloud-server-de43edca3b3e7694eb3116d8aec9858b3c469b18.tar.gz nextcloud-server-de43edca3b3e7694eb3116d8aec9858b3c469b18.zip | |
Merge pull request #20763 from nextcloud/backport/20710/stable18
[stable18] Fix Argon2 options checks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Security/Hasher.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php index 882f80ea2bf..e28b3856678 100644 --- a/lib/private/Security/Hasher.php +++ b/lib/private/Security/Hasher.php @@ -65,16 +65,11 @@ class Hasher implements IHasher { if (\defined('PASSWORD_ARGON2I')) { // password_hash fails, when the minimum values are undershot. - // In this case, ignore and revert to default - if ($this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 8) { - $this->options['memory_cost'] = $this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST); - } - if ($this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 1) { - $this->options['time_cost'] = $this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST); - } - if ($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 1) { - $this->options['threads'] = $this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS); - } + // In this case, apply minimum. + $this->options['threads'] = max($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS), 1); + // The minimum memory cost is 8 KiB per thread. + $this->options['memory_cost'] = max($this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST), $this->options['threads'] * 8); + $this->options['time_cost'] = max($this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST), 1); } $hashingCost = $this->config->getSystemValue('hashingCost', null); |