Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable20] Fix Argon2 descriptions #24792

Merged
merged 1 commit into from
Dec 21, 2020
Merged

[stable20] Fix Argon2 descriptions #24792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,27 +1530,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
Expand Down