From 6987304f4267d1e1d2a269dbb877a8f225eb8012 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Tue, 15 Apr 2025 14:35:39 -0600
Subject: [PATCH 1/7] Fix to advance past multiple recipients

---
 wolfcrypt/src/pkcs7.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index 686d06856..faf2bd4f3 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -106,6 +106,7 @@ struct PKCS7State {
     word32 currContSz;    /* size of current content */
     word32 currContRmnSz; /* remaining size of current content */
     word32 accumContSz;   /* size of accumulated content size */
+    int recipientSz; /* size of recipient set */
     byte tmpIv[MAX_CONTENT_IV_SIZE]; /* store IV if needed */
 #ifdef WC_PKCS7_STREAM_DEBUG
     word32 peakUsed; /* most bytes used for struct at any one time */
@@ -12460,14 +12461,16 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
         #ifndef NO_PKCS7_STREAM
             tmpIdx = idx;
             pkcs7->stream->aad = decryptedKey;
+            pkcs7->stream->expected = (word32)ret; /* get the full recipient set */
+            pkcs7->stream->recipientSz  = ret;
         #endif
             FALL_THROUGH;
 
         case WC_PKCS7_ENV_2:
         #ifndef NO_PKCS7_STREAM
             /* store up enough buffer for initial info set decode */
-            if ((ret = wc_PKCS7_AddDataToStream(pkcs7, in, inSz, MAX_LENGTH_SZ +
-                            MAX_VERSION_SZ + ASN_TAG_SZ, &pkiMsg, &idx)) != 0) {
+            if ((ret = wc_PKCS7_AddDataToStream(pkcs7, in, inSz,
+                    pkcs7->stream->expected, &pkiMsg, &idx)) != 0) {
                 return ret;
             }
         #endif
@@ -12483,6 +12486,7 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
         #ifndef NO_PKCS7_STREAM
             decryptedKey   = pkcs7->stream->aad;
             decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
+            tmpIdx = idx;
         #endif
 
             ret = wc_PKCS7_DecryptRecipientInfos(pkcs7, in, inSz, &idx,
@@ -12497,6 +12501,14 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             if (ret != 0)
                 break;
         #ifndef NO_PKCS7_STREAM
+            /* advance idx past recipient info set */
+            idx = tmpIdx + (word32)pkcs7->stream->recipientSz;
+
+            /* process aditional recipients as read */
+            if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &tmpIdx, &idx)) != 0) {
+                break;
+            }
+
             tmpIdx               = idx;
             pkcs7->stream->aadSz = decryptedKeySz;
             pkcs7->stream->expected = MAX_LENGTH_SZ + MAX_VERSION_SZ +

From 7a5e97e30e44be80cfd1244c9279c8364e38f8ce Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Wed, 16 Apr 2025 11:39:45 -0600
Subject: [PATCH 2/7] adjustment for recipient index advancement

---
 wolfcrypt/src/pkcs7.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index faf2bd4f3..3c31d1136 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -12316,9 +12316,17 @@ static int wc_PKCS7_ParseToRecipientInfoSet(wc_PKCS7* pkcs7, byte* in,
 
         #ifndef NO_PKCS7_STREAM
             pkcs7->stream->expected = (word32)length;
+
             if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &tmpIdx, idx)) != 0) {
                 break;
             }
+
+            /* update the stored max length */
+            if (pkcs7->stream->totalRd + pkcs7->stream->expected >
+                    pkcs7->stream->maxLen) {
+                pkcs7->stream->maxLen = pkcs7->stream->totalRd +
+                    pkcs7->stream->expected;
+            }
         #endif
 
             if (ret == 0)
@@ -12461,7 +12469,8 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
         #ifndef NO_PKCS7_STREAM
             tmpIdx = idx;
             pkcs7->stream->aad = decryptedKey;
-            pkcs7->stream->expected = (word32)ret; /* get the full recipient set */
+            /* get the full recipient set */
+            pkcs7->stream->expected     = (word32)ret;
             pkcs7->stream->recipientSz  = ret;
         #endif
             FALL_THROUGH;
@@ -12488,6 +12497,7 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
             tmpIdx = idx;
         #endif
+            pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz;
 
             ret = wc_PKCS7_DecryptRecipientInfos(pkcs7, in, inSz, &idx,
                                         decryptedKey, &decryptedKeySz,
@@ -12501,12 +12511,16 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             if (ret != 0)
                 break;
         #ifndef NO_PKCS7_STREAM
-            /* advance idx past recipient info set */
-            idx = tmpIdx + (word32)pkcs7->stream->recipientSz;
+            /* advance idx past recipient info set if not all recipients
+             * parsed */
+            if (pkcs7->stream->totalRd < (pkcs7->stream->recipientSz +
+                    tmpIdx)) {
+                idx = tmpIdx + (word32)pkcs7->stream->recipientSz;
 
-            /* process aditional recipients as read */
-            if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &tmpIdx, &idx)) != 0) {
-                break;
+                /* process additional recipients as read */
+                if ((ret = wc_PKCS7_StreamEndCase(pkcs7, &tmpIdx, &idx)) != 0) {
+                    break;
+                }
             }
 
             tmpIdx               = idx;

From 328f50570283b011f34908b0caae945e9aab9fa7 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 29 Sep 2025 17:58:15 -0600
Subject: [PATCH 3/7] add pkcs7 test with multiple recipients

---
 certs/include.am                   |   1 +
 certs/renewcerts.sh                |   5 ++
 certs/test-multiple-recipients.p7b | Bin 0 -> 6443 bytes
 tests/api/test_pkcs7.c             |  77 +++++++++++++++++++++++++++++
 tests/api/test_pkcs7.h             |   4 +-
 wolfcrypt/src/pkcs7.c              |  16 +++---
 6 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 certs/test-multiple-recipients.p7b

diff --git a/certs/include.am b/certs/include.am
index e4f6a0e6c..68fcd1e2e 100644
--- a/certs/include.am
+++ b/certs/include.am
@@ -53,6 +53,7 @@ EXTRA_DIST += \
              certs/server-revoked-key.pem \
              certs/wolfssl-website-ca.pem \
              certs/test-degenerate.p7b \
+             certs/test-multiple-recipients.p7b \
              certs/test-stream-sign.p7b \
              certs/test-stream-dec.p7b \
              certs/test-ber-exp02-05-2022.p7b \
diff --git a/certs/renewcerts.sh b/certs/renewcerts.sh
index 609726cc1..5aed64881 100755
--- a/certs/renewcerts.sh
+++ b/certs/renewcerts.sh
@@ -888,6 +888,11 @@ run_renewcerts(){
     openssl cms -encrypt -in ca-cert.pem -recip client-cert.pem -out test-stream-dec.p7b -outform DER -stream
     check_result $? ""
 
+    echo "Creating test-multiple-recipients.p7b..."
+    echo ""
+    openssl smime -encrypt -binary -aes-256-cbc -in ./client-key.pem  -out ./test-multiple-recipients.p7b -outform DER ./client-cert.pem ./server-cert.pem
+    check_result $? ""
+
     echo "End of section"
     echo "---------------------------------------------------------------------"
 
diff --git a/certs/test-multiple-recipients.p7b b/certs/test-multiple-recipients.p7b
new file mode 100644
index 0000000000000000000000000000000000000000..34915f216a1c35ac1046b685898c4be4496dab5a
GIT binary patch
literal 6443
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
Fg#a8(Gb#W8

literal 0
HcmV?d00001

diff --git a/tests/api/test_pkcs7.c b/tests/api/test_pkcs7.c
index aeb4f630c..332bc3b03 100644
--- a/tests/api/test_pkcs7.c
+++ b/tests/api/test_pkcs7.c
@@ -2145,6 +2145,83 @@ int test_wc_PKCS7_DecodeEnvelopedData_stream(void)
 #endif
 } /* END test_wc_PKCS7_DecodeEnvelopedData_stream() */
 
+
+/*
+ * Testing wc_PKCS7_DecodeEnvelopedData with streaming
+ */
+int test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients(void)
+{
+#if defined(HAVE_PKCS7)
+    EXPECT_DECLS;
+    PKCS7*      pkcs7 = NULL;
+    int ret = 0;
+    XFILE f = XBADFILE;
+    const char* testFile = "./certs/test-multiple-recipients.p7b";
+    byte testDerBuffer[8192]; /* test-multiple-recipients is currently 6433
+                                 bytes */
+    size_t testDerBufferSz = 0;
+    byte decodedData[8192];
+
+    ExpectTrue((f = XFOPEN(testFile, "rb")) != XBADFILE);
+    testDerBufferSz = XFREAD(testDerBuffer, 1,
+                sizeof(testDerBuffer), f);
+    ExpectIntNE(testDerBufferSz, 0);
+    if (f != XBADFILE) {
+        XFCLOSE(f);
+        f = XBADFILE;
+    }
+
+    /* test with server cert recipient */
+    ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId));
+    if (pkcs7) {
+        ExpectIntEQ(wc_PKCS7_InitWithCert(pkcs7, (byte*)server_cert_der_2048,
+            sizeof_server_cert_der_2048), 0);
+
+        ExpectIntEQ(wc_PKCS7_SetKey(pkcs7, (byte*)server_key_der_2048,
+            sizeof_server_key_der_2048), 0);
+
+        ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testDerBuffer,
+            (word32)testDerBufferSz, decodedData, sizeof(decodedData));
+        ExpectIntGT(ret, 0);
+        wc_PKCS7_Free(pkcs7);
+    }
+
+    /* test with client cert recipient */
+    ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId));
+    if (pkcs7) {
+        ExpectIntEQ(wc_PKCS7_InitWithCert(pkcs7, (byte*)client_cert_der_2048,
+            sizeof_client_cert_der_2048), 0);
+
+        ExpectIntEQ(wc_PKCS7_SetKey(pkcs7, (byte*)client_key_der_2048,
+            sizeof_client_key_der_2048), 0);
+
+        ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testDerBuffer,
+            (word32)testDerBufferSz, decodedData, sizeof(decodedData));
+        ExpectIntGT(ret, 0);
+        wc_PKCS7_Free(pkcs7);
+    }
+
+    /* test with ca cert recipient (which should fail) */
+    ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId));
+    if (pkcs7) {
+        ExpectIntEQ(wc_PKCS7_InitWithCert(pkcs7, (byte*)ca_cert_der_2048,
+            sizeof_ca_cert_der_2048), 0);
+
+        ExpectIntEQ(wc_PKCS7_SetKey(pkcs7, (byte*)ca_key_der_2048,
+            sizeof_ca_key_der_2048), 0);
+
+        ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testDerBuffer,
+            (word32)testDerBufferSz, decodedData, sizeof(decodedData));
+        ExpectIntLT(ret, 0);
+        wc_PKCS7_Free(pkcs7);
+    }
+
+    return EXPECT_RESULT();
+#else
+    return TEST_SKIPPED;
+#endif
+} /* END test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients() */
+
 /*
  * Testing wc_PKCS7_EncodeEnvelopedData(), wc_PKCS7_DecodeEnvelopedData()
  */
diff --git a/tests/api/test_pkcs7.h b/tests/api/test_pkcs7.h
index b07825e92..054eda248 100644
--- a/tests/api/test_pkcs7.h
+++ b/tests/api/test_pkcs7.h
@@ -47,6 +47,7 @@ int test_wc_PKCS7_NoDefaultSignedAttribs(void);
 int test_wc_PKCS7_SetOriEncryptCtx(void);
 int test_wc_PKCS7_SetOriDecryptCtx(void);
 int test_wc_PKCS7_DecodeCompressedData(void);
+int test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients(void);
 
 
 #define TEST_PKCS7_DECLS                                        \
@@ -74,7 +75,8 @@ int test_wc_PKCS7_DecodeCompressedData(void);
     TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_DecodeSymmetricKeyPackage),   \
     TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_DecodeOneSymmetricKey),       \
     TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_SetOriEncryptCtx),            \
-    TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_SetOriDecryptCtx)
+    TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_SetOriDecryptCtx),            \
+    TEST_DECL_GROUP("pkcs7_ed", test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients)
 
 #define TEST_PKCS7_SIGNED_ENCRYPTED_DATA_DECLS                              \
     TEST_DECL_GROUP("pkcs7_sed", test_wc_PKCS7_signed_enveloped)
diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index 3c31d1136..25ed7295f 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -11974,8 +11974,14 @@ static int wc_PKCS7_DecryptRecipientInfos(wc_PKCS7* pkcs7, byte* in,
             ret = wc_PKCS7_DecryptKtri(pkcs7, in, inSz, idx,
                                       decryptedKey, decryptedKeySz,
                                       recipFound);
-            if (ret != 0)
-                return ret;
+            if (ret != 0) {
+                if (ret != WC_PKCS7_WANT_READ_E && *recipFound == 0) {
+                    continue; /* try next recipient */
+                }
+                else {
+                    return ret; /* found recipient and failed decrypt */
+                }
+            }
         #else
             return NOT_COMPILED_IN;
         #endif
@@ -12096,8 +12102,8 @@ static int wc_PKCS7_DecryptRecipientInfos(wc_PKCS7* pkcs7, byte* in,
                                           recipFound);
                 if (ret != 0)
                     return ret;
-
-            } else {
+            }
+            else {
                 /* failed to find RecipientInfo, restore idx and continue */
                 *idx = savedIdx;
                 break;
@@ -12497,8 +12503,6 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
             tmpIdx = idx;
         #endif
-            pkiMsgSz = (pkcs7->stream->length > 0)? pkcs7->stream->length: inSz;
-
             ret = wc_PKCS7_DecryptRecipientInfos(pkcs7, in, inSz, &idx,
                                         decryptedKey, &decryptedKeySz,
                                         &recipFound);

From 12cfca4060b52ce0f3cd49f1a0213102c6f30c7c Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Tue, 30 Sep 2025 09:48:16 -0600
Subject: [PATCH 4/7] account for no AES build and add err trace macro

---
 tests/api/test_pkcs7.c | 8 ++++++++
 wolfcrypt/src/pkcs7.c  | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/api/test_pkcs7.c b/tests/api/test_pkcs7.c
index 332bc3b03..ec4f7f333 100644
--- a/tests/api/test_pkcs7.c
+++ b/tests/api/test_pkcs7.c
@@ -2182,7 +2182,11 @@ int test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients(void)
 
         ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testDerBuffer,
             (word32)testDerBufferSz, decodedData, sizeof(decodedData));
+    #if defined(NO_AES) || defined(NO_AES_256)
+        ExpectIntEQ(ret, ALGO_ID_E);
+    #else
         ExpectIntGT(ret, 0);
+    #endif
         wc_PKCS7_Free(pkcs7);
     }
 
@@ -2197,7 +2201,11 @@ int test_wc_PKCS7_DecodeEnvelopedData_multiple_recipients(void)
 
         ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testDerBuffer,
             (word32)testDerBufferSz, decodedData, sizeof(decodedData));
+    #if defined(NO_AES) || defined(NO_AES_256)
+        ExpectIntEQ(ret, ALGO_ID_E);
+    #else
         ExpectIntGT(ret, 0);
+    #endif
         wc_PKCS7_Free(pkcs7);
     }
 
diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index 25ed7295f..cce0c6b08 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -11975,7 +11975,8 @@ static int wc_PKCS7_DecryptRecipientInfos(wc_PKCS7* pkcs7, byte* in,
                                       decryptedKey, decryptedKeySz,
                                       recipFound);
             if (ret != 0) {
-                if (ret != WC_PKCS7_WANT_READ_E && *recipFound == 0) {
+                if (ret != WC_NO_ERR_TRACE(WC_PKCS7_WANT_READ_E) &&
+                        *recipFound == 0) {
                     continue; /* try next recipient */
                 }
                 else {

From 4e92920a7f5f9511db0b06e0a1e6c41e672a8530 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Tue, 30 Sep 2025 10:00:12 -0600
Subject: [PATCH 5/7] cast variable to word32 for compare

---
 wolfcrypt/src/pkcs7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index cce0c6b08..b8ceb3ce9 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -12518,7 +12518,7 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
         #ifndef NO_PKCS7_STREAM
             /* advance idx past recipient info set if not all recipients
              * parsed */
-            if (pkcs7->stream->totalRd < (pkcs7->stream->recipientSz +
+            if (pkcs7->stream->totalRd < ((word32)pkcs7->stream->recipientSz +
                     tmpIdx)) {
                 idx = tmpIdx + (word32)pkcs7->stream->recipientSz;
 

From fca302839501cd793ebd0b4252827bcb62af3486 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Fri, 3 Oct 2025 15:52:30 -0600
Subject: [PATCH 6/7] advance index past recipent set in non stream case too

---
 wolfcrypt/src/pkcs7.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index b8ceb3ce9..2ca132181 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -12412,9 +12412,8 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
     int recipFound = 0;
     int ret, length = 0;
     word32 idx = 0;
-#ifndef NO_PKCS7_STREAM
     word32 tmpIdx = 0;
-#endif
+    word32 recipientSetSz = 0;
     word32 contentType = 0, encOID = 0;
     word32 decryptedKeySz = MAX_ENCRYPTED_KEY_SZ;
 
@@ -12473,11 +12472,12 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             if (decryptedKey == NULL)
                 return MEMORY_E;
             wc_PKCS7_ChangeState(pkcs7, WC_PKCS7_ENV_2);
-        #ifndef NO_PKCS7_STREAM
             tmpIdx = idx;
+            recipientSetSz = (word32)ret;
+        #ifndef NO_PKCS7_STREAM
             pkcs7->stream->aad = decryptedKey;
             /* get the full recipient set */
-            pkcs7->stream->expected     = (word32)ret;
+            pkcs7->stream->expected     = recipientSetSz;
             pkcs7->stream->recipientSz  = ret;
         #endif
             FALL_THROUGH;
@@ -12532,6 +12532,8 @@ int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
             pkcs7->stream->aadSz = decryptedKeySz;
             pkcs7->stream->expected = MAX_LENGTH_SZ + MAX_VERSION_SZ +
                 ASN_TAG_SZ + MAX_LENGTH_SZ;
+        #else
+            idx = tmpIdx + recipientSetSz;
         #endif
             wc_PKCS7_ChangeState(pkcs7, WC_PKCS7_ENV_3);
             FALL_THROUGH;

From 7128932eff9d26a921848c6e65fcd380feeb727d Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 6 Oct 2025 10:48:59 -0600
Subject: [PATCH 7/7] avoid attempt of key decode and free buffer if incorrect
 recipient found

---
 wolfcrypt/src/pkcs7.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index 2ca132181..3ba2e8bfd 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -10488,6 +10488,14 @@ static int wc_PKCS7_DecryptKtri(wc_PKCS7* pkcs7, byte* in, word32 inSz,
                 XMEMCPY(encryptedKey, &pkiMsg[*idx], (word32)encryptedKeySz);
             *idx += (word32)encryptedKeySz;
 
+            /* If this is not the correct recipient then do not try to decode
+             * the encrypted key */
+            if (*recipFound == 0) {
+                XFREE(encryptedKey, pkcs7->heap, DYNAMIC_TYPE_WOLF_BIGINT);
+                ret = PKCS7_RECIP_E;
+                break;
+            }
+
             /* load private key */
         #ifdef WOLFSSL_SMALL_STACK
             privKey = (RsaKey*)XMALLOC(sizeof(RsaKey), pkcs7->heap,