Merged
Conversation
eb127d4 to
8ff5261
Compare
Member
Author
|
@droidmonkey Bump |
8ff5261 to
a62fc4e
Compare
a62fc4e to
a6f92de
Compare
droidmonkey
approved these changes
Dec 3, 2020
phoerious
added a commit
that referenced
this pull request
Dec 3, 2020
phoerious
added a commit
that referenced
this pull request
Dec 3, 2020
phoerious
added a commit
that referenced
this pull request
Dec 4, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After some discussion in #4317 as to which KDF may become the future default or at least a new option and @DReichl's eagerness to implement Argon2id right away, I have now added it to our code base as a selectable KDF.
If Argon2id lands in KeePass2 rather soon, we can backport this to 2.6, since the surface for potential breakage is very small. I did not touch any of the KDBX4 defaults, so that remains Argon2d for now.
The implementation uses libargon2 for the time begin, since that requires the least amount of code changes. In the future, we may switch to libsodium if we decide we no longer need Argon2d (or if some other miracle happens).
The new KDF UUID is
9e298b19-56db-4773-b23d-fc3ec6f0a1e6.Testing strategy
I extended the KDBX4 KDF test matrix with the new option.
Type of change