mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24792 from nextcloud/backport/23319/stable20 

[stable20] Fix Argon2 descriptions
This commit is contained in:
Roeland Jago Douma 2020-12-21 13:32:55 +01:00 committed by GitHub
parent 98c235a436 d8ff570971
commit db22392fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/config.sample.php
View File

@ -1530,28 +1530,27 @@ $CONFIG = [
*/ */
/** /**
* The allowed maximum memory in KiB to be used by the algorithm for computing a * The number of CPU threads to be used by the algorithm for computing a hash.
* hash. The smallest possible value is 8. Values that undershoot the minimum * The value must be an integer, and the minimum value is 1. Rationally it does
* will be ignored in favor of the default. * 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.
*/
'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS,
/**
* 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.
*/ */
'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST, 'hashingMemoryCost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST,
/** /**
* The allowed maximum time in seconds that can be used by the algorithm for * The number of iterations that are used by the algorithm for computing a hash.
* computing a hash. The value must be an integer, and the minimum value is 1. * The value must be an integer, and the minimum value is 1. Values that
* Values that undershoot the minimum will be ignored in favor of the default. * undershoot the minimum will be ignored in favor of the minimum.
*/ */
'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_COST, 'hashingTimeCost' => PASSWORD_ARGON2_DEFAULT_TIME_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.
*/
'hashingThreads' => PASSWORD_ARGON2_DEFAULT_THREADS,
/** /**
* The hashing cost used by hashes generated by Nextcloud * The hashing cost used by hashes generated by Nextcloud
* Using a higher value requires more time and CPU power to calculate the hashes * Using a higher value requires more time and CPU power to calculate the hashes