Skip to content

Commit c83a452

Browse files
Check for NULL pkiMsg in wc_PKCS7_DecodeEncryptedKeyPackage()
1 parent d2ab6ed commit c83a452

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

tests/api.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18319,6 +18319,7 @@ static int test_wc_PKCS7_DecodeEncryptedKeyPackage(void)
1831918319
pkcs7->encryptionKeySz = sizeof(key);
1832018320
}
1832118321
}
18322+
ExpectIntEQ(wc_PKCS7_DecodeEncryptedKeyPackage(pkcs7, NULL, ekp_cms_der_size, out, sizeof(out)), WC_NO_ERR_TRACE(BAD_FUNC_ARG));
1832218323
result = wc_PKCS7_DecodeEncryptedKeyPackage(pkcs7, ekp_cms_der, ekp_cms_der_size, out, sizeof(out));
1832318324
if (result == WC_NO_ERR_TRACE(WC_PKCS7_WANT_READ_E)) {
1832418325
result = wc_PKCS7_DecodeEncryptedKeyPackage(pkcs7, ekp_cms_der, ekp_cms_der_size, out, sizeof(out));

wolfcrypt/src/pkcs7.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14888,6 +14888,11 @@ WOLFSSL_API int wc_PKCS7_DecodeEncryptedKeyPackage(wc_PKCS7 * pkcs7,
1488814888
int length = 0;
1488914889

1489014890
do {
14891+
if (pkiMsg == NULL) {
14892+
ret = BAD_FUNC_ARG;
14893+
break;
14894+
}
14895+
1489114896
/* Expect a SEQUENCE header to start the EncryptedKeyPackage ContentInfo. */
1489214897
if (GetSequence_ex(pkiMsg, &pkiIndex, &length, pkiMsgSz, 1) < 0) {
1489314898
ret = ASN_PARSE_E;

0 commit comments

Comments
 (0)