Update some inclusion related items

Author: night1rider

wolfssl/test.h

@@ -209,9 +209,10 @@
         #endif
     #endif
     #define SOCKET_T int
-    #define SOL_SOCKET 1
     #define WOLFSSL_USE_GETADDRINFO
 
+    #if !defined(CONFIG_POSIX_API)
+    #define SOL_SOCKET 1
     static unsigned long inet_addr(const char *cp)
     {
         unsigned int a[4]; unsigned long ret;
@@ -227,6 +228,7 @@
         ret = ((a[3]<<24) + (a[2]<<16) + (a[1]<<8) + a[0]) ;
         return(ret) ;
     }
+    #endif
 #elif defined(NETOS)
     #include <string.h>
     #include <sys/types.h>

wolfssl/wolfcrypt/wc_port.h

@@ -294,12 +294,16 @@
         #endif
         #if KERNEL_VERSION_NUMBER >= 0x30100
             #include <zephyr/kernel.h>
-            #include <zephyr/posix/posix_types.h>
-            #include <zephyr/posix/pthread.h>
+            #ifndef CONFIG_ARCH_POSIX
+                #include <zephyr/posix/posix_types.h>
+                #include <zephyr/posix/pthread.h>
+            #endif
         #else
             #include <kernel.h>
-            #include <posix/posix_types.h>
-            #include <posix/pthread.h>
+            #ifndef CONFIG_ARCH_POSIX
+                #include <posix/posix_types.h>
+                #include <posix/pthread.h>
+            #endif
         #endif
     #endif
 

zephyr/CMakeLists.txt

@@ -187,11 +187,13 @@ if(CONFIG_WOLFSSL)
         target_compile_definitions(wolfSSL INTERFACE WOLFSSL_ZEPHYR)
         target_compile_definitions(wolfSSL INTERFACE WOLFSSL_USER_SETTINGS)
 
-    # Zephyr >= 4.1 provides min()/max() macros in sys/util.h that collide
-    # with wolfSSL's static inline definitions in misc.c
-    if(KERNEL_VERSION_MAJOR GREATER_EQUAL 5 OR
-       (KERNEL_VERSION_MAJOR EQUAL 4 AND KERNEL_VERSION_MINOR GREATER_EQUAL 1))
-      target_compile_definitions(wolfSSL INTERFACE WOLFSSL_HAVE_MIN_MAX)
+    if(NOT CONFIG_WOLFSSL_NO_HAVE_MIN_MAX AND
+       (KERNEL_VERSION_MAJOR GREATER_EQUAL 5 OR
+        (KERNEL_VERSION_MAJOR EQUAL 4 AND
+         KERNEL_VERSION_MINOR GREATER_EQUAL 3)))
+      target_compile_definitions(wolfSSL INTERFACE
+        WOLFSSL_HAVE_MIN
+        WOLFSSL_HAVE_MAX)
     endif()
     if(CONFIG_WOLFSSL_DEBUG)
       target_compile_definitions(wolfSSL INTERFACE DEBUG_WOLFSSL)

zephyr/Kconfig

@@ -112,6 +112,13 @@ config WOLFCRYPT_INTELASM
 	help
 	  wolfCrypt Intel Aassembly support (AVX/AVX2/AESNI)
 
+config WOLFSSL_NO_HAVE_MIN_MAX
+	bool "Force wolfSSL to use its own min/max"
+	help
+	  Disable this if Zephyr min()/max() macros cause
+	  issues. By default wolfSSL defers to Zephyr's
+	  min/max on >= 4.3.
+
 config WOLFSSL_DEBUG
 	bool "wolfSSL debug activation"
 	depends on WOLFSSL_BUILTIN

zephyr/samples/wolfssl_tls_sock/CMakeLists.txt

@@ -9,12 +9,14 @@ if(EXISTS $ENV{ZEPHYR_BASE}/VERSION)
     set(ZEPHYR_VER_MINOR ${CMAKE_MATCH_1})
 endif()
 
-if(ZEPHYR_VER_MAJOR GREATER_EQUAL 5)
-    set(EXTRA_CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zephyr_v4.1.conf)
-elseif(ZEPHYR_VER_MAJOR EQUAL 4 AND ZEPHYR_VER_MINOR GREATER_EQUAL 1)
-    set(EXTRA_CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zephyr_v4.1.conf)
+if(ZEPHYR_VER_MAJOR GREATER_EQUAL 4 OR
+   (ZEPHYR_VER_MAJOR EQUAL 3 AND
+    ZEPHYR_VER_MINOR GREATER 5))
+    set(EXTRA_CONF_FILE
+        ${CMAKE_CURRENT_SOURCE_DIR}/zephyr_v4.1.conf)
 else()
-    set(EXTRA_CONF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zephyr_legacy.conf)
+    set(EXTRA_CONF_FILE
+        ${CMAKE_CURRENT_SOURCE_DIR}/zephyr_legacy.conf)
 endif()
 
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)

zephyr/user_settings.h

@@ -40,10 +40,6 @@ extern "C" {
 /* ------------------------------------------------------------------------- */
 /* Platform */
 /* ------------------------------------------------------------------------- */
-#ifdef WOLFSSL_HAVE_MIN_MAX
-#define WOLFSSL_HAVE_MIN /* Zephyr provides min() in sys/util.h */
-#define WOLFSSL_HAVE_MAX /* Zephyr provides max() in sys/util.h */
-#endif
 #define WOLFSSL_GENERAL_ALIGNMENT 4 /* platform requires 32-bit alignment on uint32_t */
 #define SIZEOF_LONG_LONG 8          /* long long is 8 bytes / 64-bit */
 //#define WOLFSSL_NO_ASM /* optionally disable inline assembly support */