From 6020bf23681a95ad569fae6edf204ce2f12b09fb Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Fri, 28 Feb 2025 14:46:42 -0700 Subject: [PATCH] initialize test variables and fix async build --- tests/api.c | 4 ++-- wolfcrypt/src/pkcs7.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/api.c b/tests/api.c index 084630bb4a..a1c0988543 100644 --- a/tests/api.c +++ b/tests/api.c @@ -39241,10 +39241,10 @@ static int test_wc_PKCS7_DecodeEnvelopedData_stream(void) EXPECT_DECLS; PKCS7* pkcs7 = NULL; int ret; - FILE* f; + FILE* f = NULL; const char* testStream = "./certs/test-stream-dec.p7b"; byte testStreamBuffer[100]; - int testStreamBufferSz; + int testStreamBufferSz = 0; byte decodedData[MAX_TEST_DECODE_SIZE]; /* large enough to hold result of decode, which is ca-cert.pem */ WOLFSSL_BUFFER_INFO out; diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index 82885a83ca..68943451de 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -8618,7 +8618,7 @@ static int wc_PKCS7_DecryptContentEx(PKCS7* pkcs7, int encryptOID, (word32)inSz); #ifdef WOLFSSL_ASYNC_CRYPT /* async decrypt not available here, so block till done */ - ret = wc_AsyncWait(ret, &aes->asyncDev, WC_ASYNC_FLAG_NONE); + ret = wc_AsyncWait(ret, &pkcs7->decryptKey.aes->asyncDev, WC_ASYNC_FLAG_NONE); #endif break; #endif /* HAVE_AES_CBC */ @@ -8681,7 +8681,7 @@ static int wc_PKCS7_DecryptContentEx(PKCS7* pkcs7, int encryptOID, #ifdef WOLFSSL_ASYNC_CRYPT /* async decrypt not available here, so block till done */ ret = wc_AsyncWait(ret, - &pkcs7->decryptKey.des3.asyncDev, WC_ASYNC_FLAG_NONE); + &pkcs7->decryptKey.des3->asyncDev, WC_ASYNC_FLAG_NONE); #endif break; #endif /* !NO_DES3 */ @@ -13781,7 +13781,7 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(wc_PKCS7* pkcs7, byte* in, * IMPLICIT [1] tag in the authAttrs field is not used for the * DER encoding: rather a universal SET OF tag is used. */ (void)SetSet(length, pkcs7->stream->aad); /* ignoring the size returned, - * we know it is idx - encodedAttribIdx from parsing whats given */ + * we know it is idx - encodedAttribIdx from parsing what's given */ } }