move !defined(EXTERNAL_OPTS_OPENVPN) assert from src/internal.c to wo…

…lfssl/wolfcrypt/types.h; refine logic+message of assert in wolfssl/wolfcrypt/settings.h re "wolfssl/options.h included in compiled wolfssl library object..".
wolfSSL · Dec 9, 2024 · 6f0ea40 · 6f0ea40
1 parent fcce09a
commit 6f0ea40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/internal.c b/src/internal.c
@@ -92,12 +92,6 @@
  *      pair
  */
 
-
-#ifdef EXTERNAL_OPTS_OPENVPN
-#error EXTERNAL_OPTS_OPENVPN should not be defined\
-    when building wolfSSL
-#endif
-
 #ifndef WOLFCRYPT_ONLY
 
 #include <wolfssl/internal.h>

diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
@@ -319,8 +319,10 @@
     #endif
 #endif
 
-#if defined(BUILDING_WOLFSSL) && defined(WOLFSSL_OPTIONS_H)
-    #error wolfssl/options.h included in build of library object.
+#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.
 #endif
 
 #ifdef WOLFSSL_USER_SETTINGS

diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
@@ -34,6 +34,10 @@ decouple library dependencies with standard string, memory and so on.
     #include <wolfssl/wolfcrypt/settings.h>
     #include <wolfssl/wolfcrypt/wc_port.h>
 
+    #ifdef EXTERNAL_OPTS_OPENVPN
+    #error EXTERNAL_OPTS_OPENVPN should not be defined in compiled files.
+    #endif
+
     #ifdef __APPLE__
         #include <AvailabilityMacros.h>
     #endif