Skip to content

Use safe sum in PKCS7_VerifySignedData. #10882

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
kareem-wolfssl wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −4
Open

Use safe sum in PKCS7_VerifySignedData. #10882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42f453d
Use safe sum for certSz in PKCS7_VerifySignedData.
kareem-wolfssl Jul 10, 2026
8f3f18a
Also use safe sum for length in PKCS7_VerifySignedData.
kareem-wolfssl Jul 10, 2026
f8d5905
Code review feedback
kareem-wolfssl Jul 10, 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
16 changes: 12 additions & 4 deletions wolfcrypt/src/pkcs7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7641,9 +7641,13 @@ static int PKCS7_VerifySignedData(wc_PKCS7* pkcs7, const byte* hashBuf,

WOLFSSL_MSG("certificate set found");

/* adjust cert length */
length += (int)(localIdx - certIdx);
idx = certIdx;
if (!WC_SAFE_SUM_SIGNED(int, length,
(int)(localIdx - certIdx), length)) {
ret = ASN_PARSE_E;
}
else {
idx = certIdx;
}
}
}
/* in case certificates set has definite length */
Expand Down Expand Up @@ -7756,7 +7760,11 @@ static int PKCS7_VerifySignedData(wc_PKCS7* pkcs7, const byte* hashBuf,
ret = ASN_PARSE_E;

cert = &pkiMsg2[idx];
certSz += (int)(certIdx - idx);
if (!WC_SAFE_SUM_SIGNED(int, certSz,
(int)(certIdx - idx), certSz)) {
ret = BUFFER_E;
break;
}
if (certSz > length) {
ret = BUFFER_E;
break;
Expand Down
Loading