Verify size of mlen in ML-DSA external mu mode #2841
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -161,7 +161,7 @@ int ml_dsa_keypair(ml_dsa_params *params, uint8_t *pk, uint8_t *sk, uint8_t *see | |
| * - uint8_t *sk: pointer to bit-packed secret key | ||
| * - int external_mu: indicates input message m is to be processed as mu | ||
| * | ||
| * Returns 0 (success) or -1 (context string or mlen too long) | ||
| **************************************************/ | ||
| int ml_dsa_sign_internal(ml_dsa_params *params, | ||
| uint8_t *sig, | ||
|
|
@@ -205,6 +205,15 @@ int ml_dsa_sign_internal(ml_dsa_params *params, | |
| SHAKE_Final(mu, &state, ML_DSA_CRHBYTES); | ||
|
Contributor
There was a problem hiding this comment. warning: call to undeclared function 'SHAKE_Final'; ISO C99 and later do not support implicit function declarations [clang-diagnostic-implicit-function-declaration] SHAKE_Final(mu, &state, ML_DSA_CRHBYTES);
^Additional contextcrypto/fipsmodule/ml_dsa/ml_dsa_ref/sign.c:204: did you mean 'SHA1_Final'? SHAKE_Final(mu, &state, ML_DSA_CRHBYTES);
^include/openssl/sha.h:84: 'SHA1_Final' declared here OPENSSL_EXPORT int SHA1_Final(uint8_t out[SHA_DIGEST_LENGTH], SHA_CTX *sha);
^
Contributor
There was a problem hiding this comment. warning: use of undeclared identifier 'state' [clang-diagnostic-error] SHAKE_Final(mu, &state, ML_DSA_CRHBYTES);
^ |
||
| } | ||
| else { | ||
| // When external_mu is true, m is expected to be exactly ML_DSA_CRHBYTES | ||
| if (mlen != ML_DSA_CRHBYTES) { | ||
| /* FIPS 204. Section 3.6.3 Destruction of intermediate values. */ | ||
| OPENSSL_cleanse(seedbuf, sizeof(seedbuf)); | ||
| OPENSSL_cleanse(&t0, sizeof(t0)); | ||
| OPENSSL_cleanse(&s1, sizeof(s1)); | ||
| OPENSSL_cleanse(&s2, sizeof(s2)); | ||
| return -1; | ||
|
||
| } | ||
| OPENSSL_memcpy(mu, m, mlen); | ||
| } | ||
|
|
||
|
|
@@ -492,6 +501,16 @@ int ml_dsa_verify_internal(ml_dsa_params *params, | |
| SHAKE_Final(mu, &state, ML_DSA_CRHBYTES); | ||
| } | ||
| else { | ||
| // When external_mu is true, m is expected to be exactly ML_DSA_CRHBYTES | ||
| if (mlen != ML_DSA_CRHBYTES) { | ||
| /* FIPS 204. Section 3.6.3 Destruction of intermediate values. */ | ||
| OPENSSL_cleanse(rho, sizeof(rho)); | ||
| OPENSSL_cleanse(&t1, sizeof(t1)); | ||
| OPENSSL_cleanse(c, sizeof(c)); | ||
| OPENSSL_cleanse(&z, sizeof(z)); | ||
| OPENSSL_cleanse(&h, sizeof(h)); | ||
| return -1; | ||
|
||
| } | ||
| OPENSSL_memcpy(mu, m, mlen); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or too short? I could not see where the length of context is checked.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed in 5b1c5a5