Skip to content

Reject ML-DSA hashBuf with no signed attributes #12007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlm2002 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reject ML-DSA hashBuf with no signed attributes #12007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c852f9c
Guard against ML-DSA use with no signedAttributes, but non-NULL hashBuf
rlm2002 Nov 4, 2026
ea92562
Add no signedAttributes, non-NULL hashBuf test for pkcs7 ML-DSA
rlm2002 Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions wolfcrypt/src/pkcs7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6301,6 +6301,15 @@ static int wc_PKCS7_SignedDataVerifySignature(wc_PKCS7* pkcs7, byte* sig,
word32 msgSz = 0;
int msgAlloc = 0;

/* RFC 9882: without signed attributes there is no digest, and
* the digestAlgorithm field is meaningless and must be
* ignored. Reject caller-supplied hashBuf instead of
* silently ignoring it. */
if (signedAttrib == NULL && hashBuf != NULL) {
ret = BAD_FUNC_ARG;
break;
}

ret = wc_PKCS7_BuildPureSigMessage(pkcs7, signedAttrib,
signedAttribSz, &msg, &msgSz,
&msgAlloc);
Expand Down
56 changes: 56 additions & 0 deletions wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90620,6 +90620,7 @@ static wc_test_ret_t pkcs7signed_mldsa_test(void)
word32 certSz, keySz;
word32 outHeadSz, outFootSz;
int encodedSz;
int preHashSz;
int i, testSz;
int rngInit = 0;
byte preHash[WC_MAX_DIGEST_SIZE];
Expand Down Expand Up @@ -90888,6 +90889,61 @@ static wc_test_ret_t pkcs7signed_mldsa_test(void)
wc_PKCS7_Free(pkcs7);
pkcs7 = NULL;

/* negative: pure-mode ML-DSA (RFC 9882) signs the complete message,
* not a digest, so a caller-supplied hashBuf must be rejected rather
* than silently ignored. Reuses the last vector's cert/key. */
pkcs7 = wc_PKCS7_New(HEAP_HINT, devId);
if (pkcs7 == NULL)
ERROR_OUT(WC_TEST_RET_ENC_ERRNO, out_lbl);

ret = wc_PKCS7_InitWithCert(pkcs7, cert, certSz);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out_lbl);

pkcs7->rng = &rng;
pkcs7->content = (byte*)content;
pkcs7->contentSz = (word32)sizeof(content);
pkcs7->contentOID = DATA;
pkcs7->hashOID = MLDSA_TEST_HASH;
pkcs7->privateKey = key;
pkcs7->privateKeySz = keySz;

ret = wc_PKCS7_SetDefaultSignedAttribs(pkcs7, WOLFSSL_NO_ATTRIBUTES);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out_lbl);

encodedSz = wc_PKCS7_EncodeSignedData(pkcs7, out, FOURK_BUF * 5);
if (encodedSz <= 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(encodedSz), out_lbl);

wc_PKCS7_Free(pkcs7);
pkcs7 = NULL;

/* preHash is already zeroed above and was never computed over
* content; confirm it gets rejected rather than silently accepted.
* Must match MLDSA_TEST_HASH's digest size, or wc_PKCS7_BuildSignedDataDigest()
* rejects the length mismatch before the guard under test runs. */
preHashSz = wc_HashGetDigestSize(wc_OidGetHash(MLDSA_TEST_HASH));
if (preHashSz <= 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(preHashSz), out_lbl);

pkcs7 = wc_PKCS7_New(HEAP_HINT, devId);
if (pkcs7 == NULL)
ERROR_OUT(WC_TEST_RET_ENC_ERRNO, out_lbl);

ret = wc_PKCS7_InitWithCert(pkcs7, NULL, 0);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out_lbl);

ret = wc_PKCS7_VerifySignedData_ex(pkcs7, preHash, (word32)preHashSz,
out, (word32)encodedSz, NULL, 0);
if (ret != WC_NO_ERR_TRACE(BAD_FUNC_ARG))
ERROR_OUT(WC_TEST_RET_ENC_NC, out_lbl);
ret = 0;

wc_PKCS7_Free(pkcs7);
pkcs7 = NULL;

ret = 0;

out_lbl:
Expand Down
Loading