From 638d0b1a9f4fc3f7f4949f0241bbf622ff1dd47d Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Mon, 18 Mar 2024 09:57:22 +1000 Subject: [PATCH] Regression test fixes pkcs7.c: pkcs7->stream must be restored or there will be a leak. test.c: when compiled for compression, compiler warning about const --- wolfcrypt/src/pkcs7.c | 3 +++ wolfcrypt/test/test.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index 66e70504f..2bf10cd94 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -6183,6 +6183,9 @@ static int PKCS7_VerifySignedData(PKCS7* pkcs7, const byte* hashBuf, contentDynamic = (byte*)XMALLOC(contentSz, pkcs7->heap, DYNAMIC_TYPE_PKCS7); if (contentDynamic == NULL) { + #ifndef NO_PKCS7_STREAM + pkcs7->stream = stream; + #endif ret = MEMORY_E; break; } diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index de6d695d5..feab257fb 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -44891,7 +44891,7 @@ static wc_test_ret_t pkcs7signed_run_SingleShotVectors( /* encode Signed Encrypted Compressed FirmwarePkgData */ encodedSz = wc_PKCS7_EncodeSignedEncryptedCompressedFPD(pkcs7, - testVectors[i].encryptKey, testVectors[i].encryptKeySz, + (byte*)testVectors[i].encryptKey, testVectors[i].encryptKeySz, testVectors[i].privateKey, testVectors[i].privateKeySz, testVectors[i].encryptOID, testVectors[i].signOID, testVectors[i].hashOID, (byte*)testVectors[i].content, @@ -45000,7 +45000,7 @@ static wc_test_ret_t pkcs7signed_run_SingleShotVectors( XMEMSET(encryptedTmp, 0, encryptedTmpSz); /* decrypt inner encryptedData */ - pkcs7->encryptionKey = testVectors[i].encryptKey; + pkcs7->encryptionKey = (byte*)testVectors[i].encryptKey; pkcs7->encryptionKeySz = testVectors[i].encryptKeySz; encryptedTmpSz = wc_PKCS7_DecodeEncryptedData(pkcs7, pkcs7->content,