Revised sockets for USE_WOLFSSL_IO, USE_WOLFSSL_IO

This commit is contained in:
gojimmypi
2025-07-16 15:18:14 -07:00
parent 66650a95d8
commit a08b93347f
4 changed files with 7 additions and 16 deletions

View File

@@ -6,14 +6,7 @@
#error This user_settings.h header is only designed for Windows #error This user_settings.h header is only designed for Windows
#endif #endif
/* Optionally use custom IO, uncomment this line: */ #define USE_WOLFSSL_IO
/* #define WOLFSSL_USER_IO */
#ifdef WOLFSSL_USER_IO
#define WOLFSSL_NO_SOCK
#else
#define USE_WOLFSSL_IO
#endif
#define HAVE_AESGCM #define HAVE_AESGCM
#define WOLFSSL_TLS13 #define WOLFSSL_TLS13
#define HAVE_HKDF #define HAVE_HKDF

View File

@@ -6806,7 +6806,8 @@ WOLFSSL_LOCAL word32 MacSize(const WOLFSSL* ssl);
WOLFSSL_LOCAL int DoClientHelloStateless(WOLFSSL* ssl, WOLFSSL_LOCAL int DoClientHelloStateless(WOLFSSL* ssl,
const byte* input, word32 helloSz, byte isFirstCHFrag, byte* tls13); const byte* input, word32 helloSz, byte isFirstCHFrag, byte* tls13);
#endif /* !defined(NO_WOLFSSL_SERVER) */ #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, WOLFSSL_LOCAL int sockAddrEqual(SOCKADDR_S *a, XSOCKLENT aLen,
SOCKADDR_S *b, XSOCKLENT bLen); SOCKADDR_S *b, XSOCKLENT bLen);
#endif #endif

View File

@@ -1132,9 +1132,6 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#endif #endif
#endif #endif
#ifndef SOCKET_INVALID #ifndef SOCKET_INVALID
#ifndef INVALID_SOCKET
#define INVALID_SOCKET ((SOCKET_T)(-1))
#endif
#define SOCKET_INVALID INVALID_SOCKET #define SOCKET_INVALID INVALID_SOCKET
#endif #endif
#else #else

View File

@@ -50,9 +50,8 @@
#endif #endif
#endif #endif
#if defined(USE_WOLFSSL_IO) || defined(WOLFSSL_USER_IO) || \
#if defined(USE_WOLFSSL_IO) || defined(HAVE_HTTP_CLIENT) defined(HAVE_HTTP_CLIENT)
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include "zlib.h" #include "zlib.h"
#endif #endif
@@ -82,6 +81,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#elif defined(USE_WINDOWS_API) #elif defined(USE_WINDOWS_API)
#include <winsock2.h>
#include <ws2tcpip.h>
#else #else
#if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT) #if defined(WOLFSSL_LWIP) && !defined(WOLFSSL_APACHE_MYNEWT)
/* lwIP needs to be configured to use sockets API in this mode */ /* lwIP needs to be configured to use sockets API in this mode */
@@ -219,7 +220,6 @@
#if defined(WOLFSSL_EMBOS) #if defined(WOLFSSL_EMBOS)
#include <errno.h> #include <errno.h>
#endif #endif
#endif /* USE_WINDOWS_API */ #endif /* USE_WINDOWS_API */
#ifdef __sun #ifdef __sun