Cleanse the right amount of bytes in HMAC. #1613
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1613 +/- ##
=======================================
Coverage 78.03% 78.03%
=======================================
Files 562 562
Lines 94558 94558
Branches 13573 13574 +1
=======================================
Hits 73792 73792
+ Misses 20173 20172 -1
- Partials 593 594 +1 ☔ View full report in Codecov by Sentry. |
samuel40791765
previously approved these changes
May 30, 2024
WillChilds-Klein
previously approved these changes
May 31, 2024
crypto/fipsmodule/hmac/hmac.c
Outdated
| uint64_t pad[EVP_MAX_MD_BLOCK_SIZE_BYTES] = {0}; | ||
| uint64_t key_block[EVP_MAX_MD_BLOCK_SIZE_BYTES] = {0}; | ||
| uint64_t pad[EVP_MAX_MD_BLOCK_SIZE / 8] = {0}; | ||
| uint64_t key_block[EVP_MAX_MD_BLOCK_SIZE / 8] = {0}; |
There was a problem hiding this comment.
nit: sizeof(uint64_t) instead of 8 might be a little more clear.
nebeid
dismissed stale reviews from WillChilds-Klein and samuel40791765
via
e8be6e9
WillChilds-Klein
approved these changes
May 31, 2024
samuel40791765
approved these changes
May 31, 2024
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.
Issues:
N/A
Description of changes:
EVP_MAX_MD_BLOCK_SIZE is the block size in bytes. It is divided by 8 in a 64-bit word array initialisation in hmac.c
This partially reverts "Zeroize data immediately after use for FIPS (#911)", commit c7a9fd0, while keeping and correcting the cleansing.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.