From 45992164d6d916f88fef4fe2335f36d2ab033264 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Wed, 11 Dec 2024 09:46:39 -0700 Subject: [PATCH 1/2] make new sanity check be a warning --- wolfssl/wolfcrypt/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 97959113b2..ffd4f8be5d 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -325,7 +325,7 @@ #if (defined(BUILDING_WOLFSSL) && defined(WOLFSSL_USE_OPTIONS_H)) || \ (defined(BUILDING_WOLFSSL) && defined(WOLFSSL_OPTIONS_H) && \ !defined(EXTERNAL_OPTS_OPENVPN)) - #error wolfssl/options.h included in compiled wolfssl library object. + #warning wolfssl/options.h included in compiled wolfssl library object. #endif #ifdef WOLFSSL_USER_SETTINGS From 2749884fdce8853721352b6ccaadef6fc29c7fd5 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Wed, 11 Dec 2024 09:50:52 -0700 Subject: [PATCH 2/2] defining custom config avoids warning of library builds pulling in options.h --- wolfssl/wolfcrypt/settings.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index ffd4f8be5d..cf9884c373 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -322,9 +322,10 @@ #endif #endif -#if (defined(BUILDING_WOLFSSL) && defined(WOLFSSL_USE_OPTIONS_H)) || \ - (defined(BUILDING_WOLFSSL) && defined(WOLFSSL_OPTIONS_H) && \ - !defined(EXTERNAL_OPTS_OPENVPN)) +#if !defined(WOLFSSL_CUSTOM_CONFIG) && \ + ((defined(BUILDING_WOLFSSL) && defined(WOLFSSL_USE_OPTIONS_H)) || \ + (defined(BUILDING_WOLFSSL) && defined(WOLFSSL_OPTIONS_H) && \ + !defined(EXTERNAL_OPTS_OPENVPN))) #warning wolfssl/options.h included in compiled wolfssl library object. #endif