ELY-2435; ELY-2434; ELY-2433; ELY-2432 #1775
Merged
Conversation
This file contains 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
added 4 commits
September 16, 2022 13:10
…al to avoid a potential timing attack
…Digest#isEqual to avoid a potential timing attack
…isEqual to avoid a potential timing attack
…t#isEqual to avoid a potential timing attack
Skyllarr
approved these changes
Sep 16, 2022
fjuma
reviewed
Sep 16, 2022
| @@ -56,6 +57,7 @@ public boolean equals(final Object obj) { | |||
| return false; | |||
| } | |||
| RawSaltedSimpleDigestPassword other = (RawSaltedSimpleDigestPassword) obj; | |||
| return getAlgorithm().equals(other.getAlgorithm()) && Arrays.equals(digest, other.digest) && Arrays.equals(salt, other.salt); | |||
| return getAlgorithm().equals(other.getAlgorithm()) && MessageDigest.isEqual(digest, other.digest) | |||
| && MessageDigest.isEqual(salt, other.salt); | |||
There was a problem hiding this comment.
Just a very small comment, we can continue to use Arrays.equals for the salt comparison.
There was a problem hiding this comment.
For reference: reason to not change this is since salt is not user input, it is not susceptible to timing attack
fjuma
reviewed
Sep 16, 2022
| } | ||
|
|
||
| public boolean equals(final Object obj) { | ||
| if (! (obj instanceof RawScramDigestPassword)) { | ||
| return false; | ||
| } | ||
| RawScramDigestPassword other = (RawScramDigestPassword) obj; | ||
| return iterationCount == other.iterationCount && getAlgorithm().equals(other.getAlgorithm()) && Arrays.equals(digest, other.digest) && Arrays.equals(salt, other.salt); | ||
| return iterationCount == other.iterationCount && getAlgorithm().equals(other.getAlgorithm()) | ||
| && MessageDigest.isEqual(digest, other.digest) && MessageDigest.isEqual(salt, other.salt); |
There was a problem hiding this comment.
Just a very small comment, we can continue to use Arrays.equals for the salt comparison.
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.
Refer issues below:
ELY-2435
ELY-2434
ELY-2433
ELY-2432