diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c
index 595411bee..b6fe2bcd6 100644
--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@@ -1864,7 +1864,7 @@ int wc_PKCS7_VerifySignedData(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz)
         ret = wc_BerToDer(pkiMsg, pkiMsgSz, NULL, &len);
         if (ret != LENGTH_ONLY_E)
             return ret;
-        pkcs7->der = XMALLOC(len, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
+        pkcs7->der = (byte*)XMALLOC(len, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
         if (pkcs7->der == NULL)
             return MEMORY_E;
         ret = wc_BerToDer(pkiMsg, pkiMsgSz, pkcs7->der, &len);
@@ -4359,7 +4359,7 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* pkiMsg,
         ret = wc_BerToDer(pkiMsg, pkiMsgSz, NULL, &len);
         if (ret != LENGTH_ONLY_E)
             return ret;
-        pkcs7->der = XMALLOC(len, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
+        pkcs7->der = (byte*)XMALLOC(len, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
         if (pkcs7->der == NULL)
             return MEMORY_E;
         ret = wc_BerToDer(pkiMsg, pkiMsgSz, pkcs7->der, &len);
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index d26f00957..6d9b5bbbe 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -16693,6 +16693,10 @@ int pkcs7encrypted_test(void)
     testSz = sizeof(testVectors) / sizeof(pkcs7EncryptedVector);
 
     for (i = 0; i < testSz; i++) {
+        ret = wc_PKCS7_Init(&pkcs7, HEAP_HINT, devId);
+        if (ret != 0)
+            return -7599;
+
         pkcs7.content              = (byte*)testVectors[i].content;
         pkcs7.contentSz            = testVectors[i].contentSz;
         pkcs7.contentOID           = testVectors[i].contentOID;
@@ -16701,10 +16705,6 @@ int pkcs7encrypted_test(void)
         pkcs7.encryptionKeySz      = testVectors[i].encryptionKeySz;
         pkcs7.unprotectedAttribs   = testVectors[i].attribs;
         pkcs7.unprotectedAttribsSz = testVectors[i].attribsSz;
-        pkcs7.heap                 = HEAP_HINT;
-#ifdef ASN_BER_TO_DER
-        pkcs7.der                  = NULL;
-#endif
 
         /* encode encryptedData */
         encryptedSz = wc_PKCS7_EncodeEncryptedData(&pkcs7, encrypted,