Merge pull request #24795 from nextcloud/backport/23319/stable19

[stable19] Fix Argon2 descriptions
nextcloud · Dec 21, 2020 · 8a9a833 · 8a9a833
2 parents 0be0f46 + ef18e45
commit 8a9a833
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -1505,27 +1505,26 @@
  */
 
 /**
- * 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