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.

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

[stable17] Fix Argon2 options checks #20764

Merged
merged 1 commit into from
May 1, 2020
Merged

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #20710

The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum.
Options are now applied the following way:
- If config.php contains the setting with an integer higher or equal to the minimum, it is applied.
- If config.php contains the setting with an integer lower than the minimum, the minimum is applied.
- If config.php does not contain the setting or with no integer value, the PHP default is applied.

Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MichaIng MichaIng added the 3. to review Waiting for reviews label May 1, 2020
@rullzer rullzer merged commit a9d7783 into stable17 May 1, 2020
@rullzer rullzer deleted the backport/20710/stable17 branch May 1, 2020 12:43
@rullzer rullzer mentioned this pull request May 21, 2020
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants