From 4fd0df42e75869a15b828d3e48f42b6662bee957 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Tue, 7 Apr 2026 21:08:11 -0600 Subject: [PATCH] add adjustment for review --- wolfcrypt/src/pkcs7.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index dda1032877..3f6649d0ad 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -13268,7 +13268,8 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in, padCheck |= ctMaskGT(padLen, expBlockSz); padCheck |= ctMaskGT(padLen, encryptedContentSz); padCheck |= ctMaskGT(expBlockSz, encryptedContentSz); - for (padIndex = encryptedContentSz - expBlockSz; + for (padIndex = encryptedContentSz < expBlockSz ? 0 : + encryptedContentSz - expBlockSz; padIndex < encryptedContentSz; padIndex++) { byte inPad = ctMaskGTE(padIndex, encryptedContentSz - (int)padLen); @@ -15334,7 +15335,8 @@ int wc_PKCS7_DecodeEncryptedData(wc_PKCS7* pkcs7, byte* in, word32 inSz, padCheck |= ctMaskGT(padLen, expBlockSz); padCheck |= ctMaskGT(padLen, encryptedContentSz); padCheck |= ctMaskGT(expBlockSz, encryptedContentSz); - for (padIndex = encryptedContentSz - expBlockSz; + for (padIndex = encryptedContentSz < expBlockSz ? 0 : + encryptedContentSz - expBlockSz; padIndex < encryptedContentSz; padIndex++) { byte inPad = ctMaskGTE(padIndex, encryptedContentSz - (int)padLen);