From 66650a95d8f9c372945873e1a3b8946078f34bdc Mon Sep 17 00:00:00 2001
From: gojimmypi <jim@wolfssl.com>
Date: Wed, 16 Jul 2025 12:04:05 -0700
Subject: [PATCH 1/2] Improve WOLFSSL_USER_IO defaults

---
 IDE/WIN/user_settings.h     | 9 ++++++++-
 wolfssl/wolfcrypt/wc_port.h | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index a1011abf8..82ae8c15d 100644
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -6,7 +6,14 @@
 #error This user_settings.h header is only designed for Windows
 #endif
 
-#define USE_WOLFSSL_IO
+/* Optionally use custom IO, uncomment this line: */
+/* #define WOLFSSL_USER_IO */
+#ifdef WOLFSSL_USER_IO
+    #define WOLFSSL_NO_SOCK
+#else
+    #define USE_WOLFSSL_IO
+#endif
+
 #define HAVE_AESGCM
 #define WOLFSSL_TLS13
 #define HAVE_HKDF
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index c0fd47f62..7db79a0f8 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -1132,6 +1132,9 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
         #endif
     #endif
     #ifndef SOCKET_INVALID
+        #ifndef INVALID_SOCKET
+            #define INVALID_SOCKET ((SOCKET_T)(-1))
+        #endif
         #define SOCKET_INVALID INVALID_SOCKET
     #endif
 #else

From a08b93347f66302eb3195252ac6e2b512b5a30b2 Mon Sep 17 00:00:00 2001
From: gojimmypi <jim@wolfssl.com>
Date: Wed, 16 Jul 2025 15:18:14 -0700
Subject: [PATCH 2/2] Revised sockets for USE_WOLFSSL_IO, USE_WOLFSSL_IO

---
 IDE/WIN/user_settings.h     | 9 +--------
 wolfssl/internal.h          | 3 ++-
 wolfssl/wolfcrypt/wc_port.h | 3 ---
 wolfssl/wolfio.h            | 8 ++++----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index 82ae8c15d..a1011abf8 100644
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -6,14 +6,7 @@
 #error This user_settings.h header is only designed for Windows
 #endif
 
-/* Optionally use custom IO, uncomment this line: */
-/* #define WOLFSSL_USER_IO */
-#ifdef WOLFSSL_USER_IO
-    #define WOLFSSL_NO_SOCK
-#else
-    #define USE_WOLFSSL_IO
-#endif
-
+#define USE_WOLFSSL_IO
 #define HAVE_AESGCM
 #define WOLFSSL_TLS13
 #define HAVE_HKDF
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 07b75f2d6..6ee042ba5 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -6806,7 +6806,8 @@ WOLFSSL_LOCAL word32 MacSize(const WOLFSSL* ssl);
     WOLFSSL_LOCAL int DoClientHelloStateless(WOLFSSL* ssl,
             const byte* input, word32 helloSz, byte isFirstCHFrag, byte* tls13);
 #endif /* !defined(NO_WOLFSSL_SERVER) */
-#if !defined(WOLFCRYPT_ONLY) && defined(USE_WOLFSSL_IO)
+#if !defined(WOLFCRYPT_ONLY) && \
+    (defined(USE_WOLFSSL_IO) || defined(WOLFSSL_USER_IO))
     WOLFSSL_LOCAL int sockAddrEqual(SOCKADDR_S *a, XSOCKLENT aLen,
                                     SOCKADDR_S *b, XSOCKLENT bLen);
 #endif
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 7db79a0f8..c0fd47f62 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -1132,9 +1132,6 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
         #endif
     #endif
     #ifndef SOCKET_INVALID
-        #ifndef INVALID_SOCKET
-            #define INVALID_SOCKET ((SOCKET_T)(-1))
-        #endif
         #define SOCKET_INVALID INVALID_SOCKET
     #endif
 #else
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index 0673b88ad..3a01e6693 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -50,9 +50,8 @@
     #endif
 #endif
 
-
-#if defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT)
-
+#if defined(USE_WOLFSSL_IO) || defined(WOLFSSL_USER_IO) || \
+    defined(HAVE_HTTP_CLIENT)
 #ifdef HAVE_LIBZ
     #include "zlib.h"
 #endif
@@ -82,6 +81,8 @@
         #include <netinet/in.h>
     #endif
 #elif defined(USE_WINDOWS_API)
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
 #else
     #if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT)
         /* lwIP needs to be configured to use sockets API in this mode */
@@ -219,7 +220,6 @@
     #if defined(WOLFSSL_EMBOS)
         #include <errno.h>
     #endif
-
 #endif /* USE_WINDOWS_API */
 
 #ifdef __sun