diff options
| author | MichaIng <micha@dietpi.com> | 2020-10-09 21:18:32 +0300 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-12-21 11:26:34 +0300 |
| commit | d8ff570971d0cce98292c6086d1f9ca94555dc00 (patch) | |
| tree | 192a52e145854c594a3fdbdeb02403f90d36a089 /config | |
| parent | 98c22e2c7708ee18db9928c5a99449de3d7d4fd8 (diff) | |
Fix Argon2 descriptions
The threads option for the password_hash function does not define the maximum allowed number of CPU threads to be used by the hashing algorithm but the exact number of threads that is used.
Similarly the memory_cost option for the password_hash function does not define the maximum allowed memory to be used by the hashing algorithm, but the exact amount of memory that is used by the hashing table. The minimum value is 8 KiB per thread.
The time_cost option for the password_hash function does not define the allowed time in seconds, but the number of iterations for the hash function.
If the minimum values are understood, the minimum values are used instead.
Signed-off-by: MichaIng <micha@dietpi.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 2710fbf5fdb..1aba6f6381f 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1530,27 +1530,26 @@ $CONFIG = [ */ /** - * The allowed maximum memory in KiB to be used by the algorithm for computing a - * hash. The smallest possible value is 8. Values that undershoot the minimum - * will be ignored in favor of the default. + * The number of CPU threads to be used by the algorithm for computing a hash. + * The value must be an integer, and the minimum value is 1. Rationally it does + * not help to provide a number higher than the available threads on the machine. + * Values that undershoot the minimum will be ignored in favor of the minimum. */ -'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST, +'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS, /** - * The allowed maximum time in seconds that can be used by the algorithm for - * computing a hash. The value must be an integer, and the minimum value is 1. - * Values that undershoot the minimum will be ignored in favor of the default. + * The memory in KiB to be used by the algorithm for computing a hash. The value + * must be an integer, and the minimum value is 8 times the number of CPU threads. + * Values that undershoot the minimum will be ignored in favor of the minimum. */ -'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST, +'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST, /** - * The allowed number of CPU threads that can be used by the algorithm for - * computing a hash. The value must be an integer, and the minimum value is 1. - * Rationally it does not help to provide a number higher than the available - * threads on the machine. Values that undershoot the minimum will be ignored - * in favor of the default. + * The number of iterations that are used by the algorithm for computing a hash. + * The value must be an integer, and the minimum value is 1. Values that + * undershoot the minimum will be ignored in favor of the minimum. */ -'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS, +'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST, /** * The hashing cost used by hashes generated by Nextcloud |