From 7023d5212cea772acbbb0881ec7215c3bc223cd7 Mon Sep 17 00:00:00 2001 From: David Garske Date: Wed, 31 Jul 2024 13:10:52 -0700 Subject: [PATCH] Fix for `--enable-all --enable-asn=original`. --- wolfssl/wolfcrypt/settings.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 2c8aa0766..c5971de68 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -3023,13 +3023,15 @@ extern void uITRON4_free(void *p) ; #endif /* ASN Unknown Extension Callback support */ -#if defined(WOLFSSL_CUSTOM_OID) && defined(HAVE_OID_DECODING) +#if defined(WOLFSSL_CUSTOM_OID) && defined(HAVE_OID_DECODING) && \ + defined(WOLFSSL_ASN_TEMPLATE) #undef WC_ASN_UNKNOWN_EXT_CB #define WC_ASN_UNKNOWN_EXT_CB -#endif - -#if defined(WC_ASN_UNKNOWN_EXT_CB) && !defined(WOLFSSL_ASN_TEMPLATE) - #error ASN unknown extension callback is only supported with ASN template +#else + /* if user supplied build option and not using ASN template, raise error */ + #if defined(WC_ASN_UNKNOWN_EXT_CB) && !defined(WOLFSSL_ASN_TEMPLATE) + #error ASN unknown extension callback is only supported with ASN template + #endif #endif