Add missing option checks

ribes96 · ribes96 · commit 5615993f48e0 · 2025-07-03T19:01:50.000+02:00
diff --git a/src/x509.c b/src/x509.c
@@ -10738,7 +10738,8 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)
     cert->altSigValCrit = x509->altSigValCrit;
 #endif /* WOLFSSL_DUAL_ALG_CERTS */
 
-#ifdef WOLFSSL_CUSTOM_OID
+#if defined(WOLFSSL_ASN_TEMPLATE) && defined(WOLFSSL_CUSTOM_OID) && \
+    defined(HAVE_OID_ENCODING)
 
     if ((x509->customExtCount < 0) ||
             (x509->customExtCount >= NUM_CUSTOM_EXT)) {
@@ -10754,7 +10755,7 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)
             return WOLFSSL_FAILURE;
         }
     }
-#endif /* WOLFSSL_CUSTOM_OID */
+#endif /* WOLFSSL_ASN_TEMPLATE && WOLFSSL_CUSTOM_OID && HAVE_OID_ENCODING */
 
 #endif /* WOLFSSL_CERT_EXT */
 

Original file line number	Diff line number	Diff line change
`@@ -10738,7 +10738,8 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)`
`10738`	`10738`	`cert->altSigValCrit = x509->altSigValCrit;`
`10739`	`10739`	`#endif /* WOLFSSL_DUAL_ALG_CERTS */`
`10740`	`10740`
`10741`		`-#ifdef WOLFSSL_CUSTOM_OID`
	`10741`	`+#if defined(WOLFSSL_ASN_TEMPLATE) && defined(WOLFSSL_CUSTOM_OID) && \`
	`10742`	`+ defined(HAVE_OID_ENCODING)`
`10742`	`10743`
`10743`	`10744`	`if ((x509->customExtCount < 0) \|\|`
`10744`	`10745`	`(x509->customExtCount >= NUM_CUSTOM_EXT)) {`
`@@ -10754,7 +10755,7 @@ static int CertFromX509(Cert* cert, WOLFSSL_X509* x509)`
`10754`	`10755`	`return WOLFSSL_FAILURE;`
`10755`	`10756`	`}`
`10756`	`10757`	`}`
`10757`		`-#endif /* WOLFSSL_CUSTOM_OID */`
	`10758`	`+#endif /* WOLFSSL_ASN_TEMPLATE && WOLFSSL_CUSTOM_OID && HAVE_OID_ENCODING */`
`10758`	`10759`
`10759`	`10760`	`#endif /* WOLFSSL_CERT_EXT */`
`10760`	`10761`