feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

update test case to account for NO_DES3 build and resolve clang tidy warnings

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-03-05 16:28:26 -07:00
parent 68e483d196
commit 624233fb98
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api.c
View File

@@ -39268,7 +39268,11 @@ static int test_wc_PKCS7_DecodeEnvelopedData_stream(void)
ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testStreamBuffer, ret = wc_PKCS7_DecodeEnvelopedData(pkcs7, testStreamBuffer,
testStreamBufferSz, NULL, 0); testStreamBufferSz, NULL, 0);
} while (ret == WC_NO_ERR_TRACE(WC_PKCS7_WANT_READ_E)); } while (ret == WC_NO_ERR_TRACE(WC_PKCS7_WANT_READ_E));
ExpectIntGT(ret, 0); #ifdef NO_DES3
ExpectIntEQ(ret, ALGO_ID_E);
#else
ExpectIntGT(ret, 0);
#endif
if (f != XBADFILE) { if (f != XBADFILE) {
XFCLOSE(f); XFCLOSE(f);

9
wolfcrypt/src/pkcs7.c
View File

@@ -12832,11 +12832,17 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(wc_PKCS7* pkcs7, byte* in,
if (pkcs7->streamOutCb) { if (pkcs7->streamOutCb) {
ret = pkcs7->streamOutCb(pkcs7, encryptedContent, ret = pkcs7->streamOutCb(pkcs7, encryptedContent,
encryptedContentSz - padLen, pkcs7->streamCtx); encryptedContentSz - padLen, pkcs7->streamCtx);
if (ret != 0) {
WOLFSSL_MSG("Stream out callback returned failure");
ret = BUFFER_E;
break;
}
} }
else else
#endif /* ASN_BER_TO_DER */ #endif /* ASN_BER_TO_DER */
{ {
if ((word32)(encryptedContentSz - padLen) > outputSz) { if (output == NULL || (word32)(encryptedContentSz - padLen) >
outputSz) {
ret = BUFFER_E; ret = BUFFER_E;
break; break;
} }
@@ -13813,7 +13819,6 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(wc_PKCS7* pkcs7, byte* in,
if (ret == 0 && GetASNTag(pkiMsg, &localIdx, &tag, pkiMsgSz) == 0 && if (ret == 0 && GetASNTag(pkiMsg, &localIdx, &tag, pkiMsgSz) == 0 &&
tag == (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 1)) { tag == (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 1)) {
encodedAttribIdx = idx; encodedAttribIdx = idx;
encodedAttribs = pkiMsg + idx;
idx++; idx++;
if (GetLength_ex(pkiMsg, &idx, &length, pkiMsgSz, 0) <= 0) { if (GetLength_ex(pkiMsg, &idx, &length, pkiMsgSz, 0) <= 0) {