Revised sockets for USE_WOLFSSL_IO, USE_WOLFSSL_IO

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

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

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

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