diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-21 09:24:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 09:24:07 +0100 |
| commit | 114b472e7139fd40813104792cb0cbebcf72f0c1 (patch) | |
| tree | 28f8dbe20524f93261ccc72289edbaf0d38375d9 /config | |
| parent | d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d (diff) | |
| parent | ab32344308e0eb74e0f06a28332170d9fac20a2a (diff) | |
| download | nextcloud-server-114b472e7139fd40813104792cb0cbebcf72f0c1.tar.gz nextcloud-server-114b472e7139fd40813104792cb0cbebcf72f0c1.zip | |
Merge pull request #23319 from nextcloud/fix/argon2-descriptions
Fix Argon2 descriptions
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 ddfb26f5b68..fdbbbded8da 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1547,27 +1547,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 |