wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better guarding.

Browse Source
This commit is contained in:
Anthony Hu
2024-07-10 18:28:22 -04:00
parent 6456281b41
commit fe2a826ede
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/pkcs7.c
View File

@ -830,6 +830,10 @@ int wc_PKCS7_Init(PKCS7* pkcs7, void* heap, int devId)
return 0; return 0;
} }
#if defined(WOLFSSL_CUSTOM_OID)
xxx
#endif
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \ #if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING) && defined(HAVE_OID_DECODING)
void wc_PKCS7_SetUnknownExtCallback(PKCS7* pkcs7, wc_UnknownExtCallback cb) void wc_PKCS7_SetUnknownExtCallback(PKCS7* pkcs7, wc_UnknownExtCallback cb)
@ -1083,7 +1087,10 @@ int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* derCert, word32 derCertSz)
int devId; int devId;
Pkcs7Cert* cert; Pkcs7Cert* cert;
Pkcs7Cert* lastCert; Pkcs7Cert* lastCert;
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING)
wc_UnknownExtCallback cb; wc_UnknownExtCallback cb;
#endif
if (pkcs7 == NULL || (derCert == NULL && derCertSz != 0)) { if (pkcs7 == NULL || (derCert == NULL && derCertSz != 0)) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -1092,13 +1099,18 @@ int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* derCert, word32 derCertSz)
heap = pkcs7->heap; heap = pkcs7->heap;
devId = pkcs7->devId; devId = pkcs7->devId;
cert = pkcs7->certList; cert = pkcs7->certList;
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING)
cb = pkcs7->unknownExtCallback; cb = pkcs7->unknownExtCallback;
#endif
ret = wc_PKCS7_Init(pkcs7, heap, devId); ret = wc_PKCS7_Init(pkcs7, heap, devId);
if (ret != 0) if (ret != 0)
return ret; return ret;
#if defined(WOLFSSL_CUSTOM_OID) && defined(WOLFSSL_ASN_TEMPLATE) \
&& defined(HAVE_OID_DECODING)
pkcs7->unknownExtCallback = cb; pkcs7->unknownExtCallback = cb;
#endif
pkcs7->certList = cert; pkcs7->certList = cert;
if (derCert != NULL && derCertSz > 0) { if (derCert != NULL && derCertSz > 0) {