From 77e1fb662b1a704f6e52f42d1c021da478388452 Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Fri, 9 Jan 2026 13:44:08 +0100 Subject: [PATCH] Remove circular dependency between ssl.h and wolfio.h --- wolfssl/ssl.h | 8 -------- wolfssl/wolfio.h | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index a1c7bedf4..83385d876 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -270,8 +270,6 @@ typedef struct WOLFSSL_BY_DIR WOLFSSL_BY_DIR; /* redeclare guard */ #define WOLFSSL_TYPES_DEFINED -#include - /* The WOLFSSL_RSA type is required in all build configurations. */ #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #include @@ -2158,12 +2156,6 @@ WOLFSSL_API int wolfSSL_BIO_set_mem_buf(WOLFSSL_BIO* bio, WOLFSSL_BUF_MEM* bufMe #endif WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio); -#ifdef WOLFSSL_HAVE_BIO_ADDR -WOLFSSL_API WOLFSSL_BIO_ADDR *wolfSSL_BIO_ADDR_new(void); -WOLFSSL_API void wolfSSL_BIO_ADDR_free(WOLFSSL_BIO_ADDR *addr); -WOLFSSL_API void wolfSSL_BIO_ADDR_clear(WOLFSSL_BIO_ADDR *addr); -#endif /* WOLFSSL_HAVE_BIO_ADDR */ - #endif /* !NO_BIO */ WOLFSSL_API void wolfSSL_RAND_screen(void); diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h index 662c7783b..8430fdf44 100644 --- a/wolfssl/wolfio.h +++ b/wolfssl/wolfio.h @@ -585,6 +585,10 @@ union WOLFSSL_BIO_ADDR { typedef union WOLFSSL_BIO_ADDR WOLFSSL_BIO_ADDR; +WOLFSSL_API WOLFSSL_BIO_ADDR *wolfSSL_BIO_ADDR_new(void); +WOLFSSL_API void wolfSSL_BIO_ADDR_free(WOLFSSL_BIO_ADDR *addr); +WOLFSSL_API void wolfSSL_BIO_ADDR_clear(WOLFSSL_BIO_ADDR *addr); + #if defined(WOLFSSL_DTLS) && defined(OPENSSL_EXTRA) WOLFSSL_API int wolfIO_SendTo(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int wrFlags); WOLFSSL_API int wolfIO_RecvFrom(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int rdFlags);