wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9008 from gojimmypi/pr-wolfssl_user_io

Browse Source 
Improve WOLFSSL_USER_IO defaults
This commit is contained in:
Sean Parkinson
2025-07-22 16:37:59 +10:00
committed by GitHub
parent 7417958649 a08b93347f
commit 21f283c143
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfssl/internal.h
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

8
wolfssl/wolfio.h
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