Skip to content

Commit 77e1fb6

Browse files
committed
Remove circular dependency between ssl.h and wolfio.h
1 parent e86ceb2 commit 77e1fb6

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

wolfssl/ssl.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,6 @@ typedef struct WOLFSSL_BY_DIR WOLFSSL_BY_DIR;
270270
/* redeclare guard */
271271
#define WOLFSSL_TYPES_DEFINED
272272

273-
#include <wolfssl/wolfio.h>
274-
275273
/* The WOLFSSL_RSA type is required in all build configurations. */
276274
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
277275
#include <wolfssl/openssl/rsa.h>
@@ -2158,12 +2156,6 @@ WOLFSSL_API int wolfSSL_BIO_set_mem_buf(WOLFSSL_BIO* bio, WOLFSSL_BUF_MEM* bufMe
21582156
#endif
21592157
WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio);
21602158

2161-
#ifdef WOLFSSL_HAVE_BIO_ADDR
2162-
WOLFSSL_API WOLFSSL_BIO_ADDR *wolfSSL_BIO_ADDR_new(void);
2163-
WOLFSSL_API void wolfSSL_BIO_ADDR_free(WOLFSSL_BIO_ADDR *addr);
2164-
WOLFSSL_API void wolfSSL_BIO_ADDR_clear(WOLFSSL_BIO_ADDR *addr);
2165-
#endif /* WOLFSSL_HAVE_BIO_ADDR */
2166-
21672159
#endif /* !NO_BIO */
21682160

21692161
WOLFSSL_API void wolfSSL_RAND_screen(void);

wolfssl/wolfio.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,10 @@ union WOLFSSL_BIO_ADDR {
585585

586586
typedef union WOLFSSL_BIO_ADDR WOLFSSL_BIO_ADDR;
587587

588+
WOLFSSL_API WOLFSSL_BIO_ADDR *wolfSSL_BIO_ADDR_new(void);
589+
WOLFSSL_API void wolfSSL_BIO_ADDR_free(WOLFSSL_BIO_ADDR *addr);
590+
WOLFSSL_API void wolfSSL_BIO_ADDR_clear(WOLFSSL_BIO_ADDR *addr);
591+
588592
#if defined(WOLFSSL_DTLS) && defined(OPENSSL_EXTRA)
589593
WOLFSSL_API int wolfIO_SendTo(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int wrFlags);
590594
WOLFSSL_API int wolfIO_RecvFrom(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int rdFlags);

0 commit comments

Comments
 (0)