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

Merge pull request #5739 from anhu/no_WOLFSSL_DYN_CERT

Browse Source
This commit is contained in:
Hayden Roche
2022-11-03 14:24:34 -07:00
committed by GitHub
parent 7414dd7ea5 0158c82487
commit fbc4af8701
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/asn.c
View File

@ -20806,7 +20806,8 @@ static int DecodeCertReq(DecodedCert* cert, int* criticalExt)
int ParseCert(DecodedCert* cert, int type, int verify, void* cm) int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
{ {
int ret; int ret;
#if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_DYN_CERT) #if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
char* ptr; char* ptr;
#endif #endif
@ -20814,7 +20815,8 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
if (ret < 0) if (ret < 0)
return ret; return ret;
#if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_DYN_CERT) #if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
/* cert->subjectCN not stored as copy of WOLFSSL_NO_MALLOC defind */ /* cert->subjectCN not stored as copy of WOLFSSL_NO_MALLOC defind */
if (cert->subjectCNLen > 0) { if (cert->subjectCNLen > 0) {
ptr = (char*) XMALLOC(cert->subjectCNLen + 1, cert->heap, ptr = (char*) XMALLOC(cert->subjectCNLen + 1, cert->heap,
@ -20828,7 +20830,8 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
} }
#endif #endif
#if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_DYN_CERT) #if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
/* cert->publicKey not stored as copy if WOLFSSL_NO_MALLOC defined */ /* cert->publicKey not stored as copy if WOLFSSL_NO_MALLOC defined */
if ((cert->keyOID == RSAk if ((cert->keyOID == RSAk
#ifdef WC_RSA_PSS #ifdef WC_RSA_PSS