diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-21 13:33:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 13:33:39 +0100 |
| commit | 8a9a83351a1db122e5001ec8b0f7586dd34c2e09 (patch) | |
| tree | d4bb974772f3ef5a6615f4450425bcfb4bf3f345 | |
| parent | 0be0f46f9385b5999c3c84499188b82356da08dd (diff) | |
| parent | ef18e458133a98b9e067bf827e89289417c0a5f7 (diff) | |
| download | nextcloud-server-8a9a83351a1db122e5001ec8b0f7586dd34c2e09.tar.gz nextcloud-server-8a9a83351a1db122e5001ec8b0f7586dd34c2e09.zip | |
Merge pull request #24795 from nextcloud/backport/23319/stable19
[stable19] Fix Argon2 descriptions
| -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 16216bb75c6..30ea1efb362 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1505,27 +1505,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 |