Increase KDF iteration count in KeyStoreWrapper
#107107
Merged
Conversation
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
n1v0lg
added
>enhancement
:Core/Infra/CLI
n1v0lg
commented
Apr 4, 2024
| @@ -114,19 +114,19 @@ public void writeTo(StreamOutput out) throws IOException { | |||
|
|
|||
| /** The oldest metadata format version that can be read. */ | |||
| private static final int MIN_FORMAT_VERSION = 3; | |||
| /** Legacy versions of the metadata written before the keystore data. */ | |||
| public static final int V2_VERSION = 2; | |||
There was a problem hiding this comment.
Unused, so I'm removing it.
|
Hi @n1v0lg, I've created a changelog YAML for you. |
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
|
@elasticmachine update branch |
rjernst
approved these changes
Apr 5, 2024
|
|
||
| /** The algorithm used to derive the cipher key from a password. */ | ||
| private static final String KDF_ALGO = "PBKDF2WithHmacSHA512"; | ||
|
|
||
| /** The number of iterations to derive the cipher key, for versions of the keystore preceding the iteration count increase. */ | ||
| private static final int KDF_ITERS_BEFORE_HIGHER_KDF_ITERATION_COUNT_VERSION = 10000; |
There was a problem hiding this comment.
I would put this inline in getKdfIterationCountForVersion, no need to take up memory forever for it.
…icsearch into iter-count-keystore-wrapper
n1v0lg
added
the
auto-merge-without-approval
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR increases the KDF iteration count for the keystore password.
Additional context in ES-8063.