wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

checkpoint: add WOLFSSL_BIO_ADDR, wolfSSL_BIO_ADDR_new(), wolfSSL_BIO_ADDR_free(), wolfSSL_BIO_ADDR_clear(), wolfIO_SendTo(), wolfIO_RecvFrom(); fix name of wolfSSL_BIO_s_datagram().

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-05-26 18:17:55 -05:00
parent 08940866c3
commit 29ec038aa6
9 changed files with 222 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/bio.c
View File

@ -343,7 +343,6 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
#endif #endif
break; break;
case WOLFSSL_BIO_SOCKET: case WOLFSSL_BIO_SOCKET:
case WOLFSSL_BIO_DGRAM:
#ifdef USE_WOLFSSL_IO #ifdef USE_WOLFSSL_IO
/* BIO requires built-in socket support /* BIO requires built-in socket support
* (cannot be used with WOLFSSL_USER_IO) */ * (cannot be used with WOLFSSL_USER_IO) */
@ -352,6 +351,27 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif #endif
break; break;
#ifdef WOLFSSL_HAVE_BIO_ADDR
case WOLFSSL_BIO_DGRAM:
#ifdef USE_WOLFSSL_IO
/* BIO requires built-in socket support
* (cannot be used with WOLFSSL_USER_IO) */
if (bio->connected)
ret = wolfIO_Recv(bio->num, (char*)buf, len, 0);
else {
if (bio->peer_addr == NULL)
bio->peer_addr = wolfSSL_BIO_ADDR_new();
else
wolfSSL_BIO_ADDR_clear(bio->peer_addr);
ret = wolfIO_RecvFrom(bio->num, bio->peer_addr, (char*)buf, len, 0);
}
#else
ret = NOT_COMPILED_IN;
#endif
break;
#endif
} /* switch */ } /* switch */
} }
@ -725,7 +745,6 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
#endif #endif
break; break;
case WOLFSSL_BIO_SOCKET: case WOLFSSL_BIO_SOCKET:
case WOLFSSL_BIO_DGRAM:
#ifdef USE_WOLFSSL_IO #ifdef USE_WOLFSSL_IO
/* BIO requires built-in socket support /* BIO requires built-in socket support
* (cannot be used with WOLFSSL_USER_IO) */ * (cannot be used with WOLFSSL_USER_IO) */
@ -734,6 +753,24 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif #endif
break; break;
#ifdef WOLFSSL_HAVE_BIO_ADDR
case WOLFSSL_BIO_DGRAM:
#ifdef USE_WOLFSSL_IO
/* BIO requires built-in socket support
* (cannot be used with WOLFSSL_USER_IO) */
if (bio->connected)
ret = wolfIO_Send(bio->num, (char*)data, len, 0);
else if (bio->peer_addr != NULL)
ret = wolfIO_SendTo(bio->num, bio->peer_addr, (char*)data, len, 0);
else
ret = SOCKET_NOT_CONNECTED_E;
#else
ret = NOT_COMPILED_IN;
#endif
break;
#endif
} /* switch */ } /* switch */
} }
@ -797,6 +834,25 @@ long wolfSSL_BIO_ctrl(WOLFSSL_BIO *bio, int cmd, long larg, void *parg)
case BIO_CTRL_RESET: case BIO_CTRL_RESET:
ret = (long)wolfSSL_BIO_reset(bio); ret = (long)wolfSSL_BIO_reset(bio);
break; break;
#ifdef WOLFSSL_HAVE_BIO_ADDR
case BIO_CTRL_DGRAM_CONNECT:
case BIO_CTRL_DGRAM_SET_PEER:
if (bio->peer_addr)
wolfSSL_BIO_ADDR_free(bio->peer_addr);
bio->peer_addr = (WOLFSSL_BIO_ADDR *)parg;
ret = WOLFSSL_SUCCESS;
break;
case BIO_CTRL_DGRAM_SET_CONNECTED:
bio->connected = (parg != NULL);
if (bio->peer_addr)
wolfSSL_BIO_ADDR_free(bio->peer_addr);
bio->peer_addr = (WOLFSSL_BIO_ADDR *)parg;
ret = WOLFSSL_SUCCESS;
break;
#endif /* WOLFSSL_HAVE_BIO_ADDR */
default: default:
WOLFSSL_MSG("CMD not yet implemented"); WOLFSSL_MSG("CMD not yet implemented");
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@ -830,8 +886,47 @@ int wolfSSL_BIO_up_ref(WOLFSSL_BIO* bio)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#endif
#ifdef WOLFSSL_HAVE_BIO_ADDR
WOLFSSL_BIO_ADDR *wolfSSL_BIO_ADDR_new(void) {
WOLFSSL_BIO_ADDR *addr = XMALLOC(sizeof(*addr), NULL, DYNAMIC_TYPE_BIO);
if (addr)
addr->sa.sa_family = AF_UNSPEC;
return addr;
}
void wolfSSL_BIO_ADDR_free(WOLFSSL_BIO_ADDR *addr) {
XFREE(addr, NULL, DYNAMIC_TYPE_BIO);
}
void wolfSSL_BIO_ADDR_clear(WOLFSSL_BIO_ADDR *addr) {
if (addr == NULL)
return;
XMEMSET(addr, 0, sizeof(*addr));
addr->sa.sa_family = AF_UNSPEC;
}
socklen_t wolfSSL_BIO_ADDR_size(const WOLFSSL_BIO_ADDR *addr) {
switch (addr->sa.sa_family) {
#ifndef WOLFSSL_NO_BIO_ADDR_IN
case AF_INET:
return sizeof(addr->sa_in);
#endif
#ifdef WOLFSSL_IPV6
case AF_INET6:
return sizeof(addr->sa_in6);
#endif
#ifndef WOLFSSL_NO_BIO_ADDR_UN
case AF_UNIX:
return sizeof(addr->sa_un);
#endif
default:
return sizeof(*addr);
}
}
#endif /* WOLFSSL_HAVE_BIO_ADDR */
#endif /* OPENSSL_ALL || OPENSSL_EXTRA */
/* helper function for wolfSSL_BIO_gets /* helper function for wolfSSL_BIO_gets
* size till a newline is hit * size till a newline is hit
@ -2150,12 +2245,12 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
} }
WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_dgram(void) WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_datagram(void)
{ {
static WOLFSSL_BIO_METHOD meth = static WOLFSSL_BIO_METHOD meth =
WOLFSSL_BIO_METHOD_INIT(WOLFSSL_BIO_DGRAM); WOLFSSL_BIO_METHOD_INIT(WOLFSSL_BIO_DGRAM);
WOLFSSL_ENTER("wolfSSL_BIO_s_dgram"); WOLFSSL_ENTER("wolfSSL_BIO_s_datagram");
return &meth; return &meth;
} }
@ -2163,7 +2258,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
WOLFSSL_BIO* wolfSSL_BIO_new_dgram(int fd, int closeF) WOLFSSL_BIO* wolfSSL_BIO_new_dgram(int fd, int closeF)
{ {
WOLFSSL_BIO* bio = wolfSSL_BIO_new(wolfSSL_BIO_s_dgram()); WOLFSSL_BIO* bio = wolfSSL_BIO_new(wolfSSL_BIO_s_datagram());
WOLFSSL_ENTER("wolfSSL_BIO_new_dgram"); WOLFSSL_ENTER("wolfSSL_BIO_new_dgram");
if (bio) { if (bio) {

3
src/internal.c
View File

@ -25639,6 +25639,9 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
case DUPLICATE_TLS_EXT_E: case DUPLICATE_TLS_EXT_E:
return "Duplicate TLS extension in message."; return "Duplicate TLS extension in message.";
case SOCKET_NOT_CONNECTED_E:
return "Socket has no associated peer.";
default : default :
return "unknown error number"; return "unknown error number";
} }

25
src/wolfio.c
View File

@ -1113,6 +1113,31 @@ int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags)
return sent; return sent;
} }
#ifdef WOLFSSL_HAVE_BIO_ADDR
int wolfIO_RecvFrom(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int rdFlags)
{
int recvd;
socklen_t addr_len = (socklen_t)sizeof(*addr);
recvd = (int)recvfrom(sd, buf, (size_t)sz, rdFlags, addr ? &addr->sa : NULL, addr ? &addr_len : 0);
recvd = TranslateReturnCode(recvd, (int)sd);
return recvd;
}
int wolfIO_SendTo(SOCKET_T sd, WOLFSSL_BIO_ADDR *addr, char *buf, int sz, int wrFlags)
{
int sent;
sent = (int)sendto(sd, buf, (size_t)sz, wrFlags, addr ? &addr->sa : NULL, addr ? wolfSSL_BIO_ADDR_size(addr) : 0);
sent = TranslateReturnCode(sent, (int)sd);
return sent;
}
#endif /* WOLFSSL_HAVE_BIO_ADDR */
#endif /* USE_WOLFSSL_IO */ #endif /* USE_WOLFSSL_IO */

2
wolfssl/error-ssl.h
View File

@ -185,8 +185,8 @@ enum wolfSSL_ErrorCodes {
DTLS_CID_ERROR = -454, /* Wrong or missing CID */ DTLS_CID_ERROR = -454, /* Wrong or missing CID */
DTLS_TOO_MANY_FRAGMENTS_E = -455, /* Received too many fragments */ DTLS_TOO_MANY_FRAGMENTS_E = -455, /* Received too many fragments */
QUIC_WRONG_ENC_LEVEL = -456, /* QUIC data received on wrong encryption level */ QUIC_WRONG_ENC_LEVEL = -456, /* QUIC data received on wrong encryption level */
DUPLICATE_TLS_EXT_E = -457, /* Duplicate TLS extension in msg. */ DUPLICATE_TLS_EXT_E = -457, /* Duplicate TLS extension in msg. */
SOCKET_NOT_CONNECTED_E = -458, /* Socket has no associated peer. */
/* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */ /* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */
/* begin negotiation parameter errors */ /* begin negotiation parameter errors */

54
wolfssl/internal.h
View File

@ -2743,6 +2743,60 @@ typedef struct WOLFSSL_DTLS_PEERSEQ {
#endif #endif
} WOLFSSL_DTLS_PEERSEQ; } WOLFSSL_DTLS_PEERSEQ;
struct WOLFSSL_BIO {
WOLFSSL_BUF_MEM* mem_buf;
WOLFSSL_BIO_METHOD* method;
WOLFSSL_BIO* prev; /* previous in chain */
WOLFSSL_BIO* next; /* next in chain */
WOLFSSL_BIO* pair; /* BIO paired with */
void* heap; /* user heap hint */
void* ptr; /* WOLFSSL, file descriptor, MD, or mem buf */
void* usrCtx; /* user set pointer */
char* ip; /* IP address for wolfIO_TcpConnect */
word16 port; /* Port for wolfIO_TcpConnect */
char* infoArg; /* BIO callback argument */
wolf_bio_info_cb infoCb; /* BIO callback */
int wrSz; /* write buffer size (mem) */
int wrSzReset; /* First buffer size (mem) - read ONLY data */
int wrIdx; /* current index for write buffer */
int rdIdx; /* current read index */
int readRq; /* read request */
int num; /* socket num or length */
int eof; /* eof flag */
int flags;
byte type; /* method type */
byte init:1; /* bio has been initialized */
byte shutdown:1; /* close flag */
byte connected:1; /* connected state, for datagram BIOs -- as for
* struct WOLFSSL_DTLS_CTX, when set, sendto and
* recvfrom leave the peer_addr unchanged. */
#ifdef WOLFSSL_HAVE_BIO_ADDR
union WOLFSSL_BIO_ADDR *peer_addr; /* for datagram BIOs, the socket address stored
* with BIO_CTRL_DGRAM_CONNECT,
* BIO_CTRL_DGRAM_SET_CONNECTED, or
* BIO_CTRL_DGRAM_SET_PEER, or stored when a
* packet was received on an unconnected BIO. */
#endif
#ifdef WORD64_AVAILABLE
word64 bytes_read;
word64 bytes_written;
#else
word32 bytes_read;
word32 bytes_written;
#endif
#ifdef HAVE_EX_DATA
WOLFSSL_CRYPTO_EX_DATA ex_data;
#endif
#if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA)
wolfSSL_Ref ref;
#endif
};
#ifdef WOLFSSL_HAVE_BIO_ADDR
WOLFSSL_LOCAL socklen_t wolfSSL_BIO_ADDR_size(const WOLFSSL_BIO_ADDR *addr);
#endif
#define MAX_WRITE_IV_SZ 16 /* max size of client/server write_IV */ #define MAX_WRITE_IV_SZ 16 /* max size of client/server write_IV */

2
wolfssl/openssl/bio.h
View File

@ -61,6 +61,7 @@
#define BIO_s_file wolfSSL_BIO_s_file #define BIO_s_file wolfSSL_BIO_s_file
#define BIO_s_bio wolfSSL_BIO_s_bio #define BIO_s_bio wolfSSL_BIO_s_bio
#define BIO_s_socket wolfSSL_BIO_s_socket #define BIO_s_socket wolfSSL_BIO_s_socket
#define BIO_s_datagram wolfSSL_BIO_s_datagram
#define BIO_s_accept wolfSSL_BIO_s_socket #define BIO_s_accept wolfSSL_BIO_s_socket
#define BIO_set_fd wolfSSL_BIO_set_fd #define BIO_set_fd wolfSSL_BIO_set_fd
#define BIO_set_close wolfSSL_BIO_set_close #define BIO_set_close wolfSSL_BIO_set_close
@ -168,6 +169,7 @@
#define BIO_C_SET_WRITE_BUF_SIZE 136 #define BIO_C_SET_WRITE_BUF_SIZE 136
#define BIO_C_MAKE_BIO_PAIR 138 #define BIO_C_MAKE_BIO_PAIR 138
#define BIO_CTRL_DGRAM_CONNECT 31
#define BIO_CTRL_DGRAM_SET_CONNECTED 32 #define BIO_CTRL_DGRAM_SET_CONNECTED 32
#define BIO_CTRL_DGRAM_QUERY_MTU 40 #define BIO_CTRL_DGRAM_QUERY_MTU 40
#define BIO_CTRL_DGRAM_SET_PEER 44 #define BIO_CTRL_DGRAM_SET_PEER 44

52
wolfssl/ssl.h
View File

@ -538,47 +538,6 @@ struct WOLFSSL_BIO_METHOD {
typedef long (*wolf_bio_info_cb)(WOLFSSL_BIO *bio, int event, const char *parg, typedef long (*wolf_bio_info_cb)(WOLFSSL_BIO *bio, int event, const char *parg,
int iarg, long larg, long return_value); int iarg, long larg, long return_value);
struct WOLFSSL_BIO {
WOLFSSL_BUF_MEM* mem_buf;
WOLFSSL_BIO_METHOD* method;
WOLFSSL_BIO* prev; /* previous in chain */
WOLFSSL_BIO* next; /* next in chain */
WOLFSSL_BIO* pair; /* BIO paired with */
void* heap; /* user heap hint */
void* ptr; /* WOLFSSL, file descriptor, MD, or mem buf */
void* usrCtx; /* user set pointer */
char* ip; /* IP address for wolfIO_TcpConnect */
word16 port; /* Port for wolfIO_TcpConnect */
char* infoArg; /* BIO callback argument */
wolf_bio_info_cb infoCb; /* BIO callback */
int wrSz; /* write buffer size (mem) */
int wrSzReset; /* First buffer size (mem) - read ONLY data */
int wrIdx; /* current index for write buffer */
int rdIdx; /* current read index */
int readRq; /* read request */
int num; /* socket num or length */
int eof; /* eof flag */
int flags;
byte type; /* method type */
byte init:1; /* bio has been initialized */
byte shutdown:1; /* close flag */
#ifdef WORD64_AVAILABLE
word64 bytes_read;
word64 bytes_written;
#else
word32 bytes_read;
word32 bytes_written;
#endif
#ifdef HAVE_EX_DATA
WOLFSSL_CRYPTO_EX_DATA ex_data;
#endif
#if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA)
wolfSSL_Ref ref;
#endif
};
typedef struct WOLFSSL_COMP_METHOD { typedef struct WOLFSSL_COMP_METHOD {
int type; /* stunnel dereference */ int type; /* stunnel dereference */
} WOLFSSL_COMP_METHOD; } WOLFSSL_COMP_METHOD;
@ -1841,7 +1800,7 @@ WOLFSSL_API WOLFSSL_BIO *wolfSSL_BIO_new_fd(int fd, int close_flag);
WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_bio(void); WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_bio(void);
WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_socket(void); WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_socket(void);
WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_dgram(void); WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_s_datagram(void);
WOLFSSL_API WOLFSSL_BIO *wolfSSL_BIO_new_connect(const char *str); WOLFSSL_API WOLFSSL_BIO *wolfSSL_BIO_new_connect(const char *str);
WOLFSSL_API WOLFSSL_BIO *wolfSSL_BIO_new_accept(const char *port); WOLFSSL_API WOLFSSL_BIO *wolfSSL_BIO_new_accept(const char *port);
@ -1884,7 +1843,14 @@ WOLFSSL_API int wolfSSL_BIO_set_mem_buf(WOLFSSL_BIO* bio, WOLFSSL_BUF_MEM* bufMe
int closeFlag); int closeFlag);
#endif #endif
WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio); WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio);
#endif
#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); WOLFSSL_API void wolfSSL_RAND_screen(void);
WOLFSSL_API const char* wolfSSL_RAND_file_name(char* fname, unsigned long len); WOLFSSL_API const char* wolfSSL_RAND_file_name(char* fname, unsigned long len);

1
wolfssl/wolfcrypt/types.h
View File

@ -1061,6 +1061,7 @@ typedef struct w64wrapper {
DYNAMIC_TYPE_SM4_BUFFER = 99, DYNAMIC_TYPE_SM4_BUFFER = 99,
DYNAMIC_TYPE_DEBUG_TAG = 100, DYNAMIC_TYPE_DEBUG_TAG = 100,
DYNAMIC_TYPE_LMS = 101, DYNAMIC_TYPE_LMS = 101,
DYNAMIC_TYPE_BIO = 102,
DYNAMIC_TYPE_SNIFFER_SERVER = 1000, DYNAMIC_TYPE_SNIFFER_SERVER = 1000,
DYNAMIC_TYPE_SNIFFER_SESSION = 1001, DYNAMIC_TYPE_SNIFFER_SESSION = 1001,
DYNAMIC_TYPE_SNIFFER_PB = 1002, DYNAMIC_TYPE_SNIFFER_PB = 1002,

26
wolfssl/wolfio.h
View File

@ -463,6 +463,32 @@ WOLFSSL_API int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port);
WOLFSSL_API int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags); WOLFSSL_API int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags);
WOLFSSL_API int wolfIO_Recv(SOCKET_T sd, char *buf, int sz, int rdFlags); WOLFSSL_API int wolfIO_Recv(SOCKET_T sd, char *buf, int sz, int rdFlags);
#ifdef WOLFSSL_HAVE_BIO_ADDR
#ifndef WOLFSSL_NO_BIO_ADDR_UN
#include <sys/un.h>
#endif
union WOLFSSL_BIO_ADDR {
struct sockaddr sa;
#ifndef WOLFSSL_NO_BIO_ADDR_IN
struct sockaddr_in sa_in;
#endif
#ifdef WOLFSSL_IPV6
struct sockaddr_in6 sa_in6;
#endif
#ifndef WOLFSSL_NO_BIO_ADDR_UN
struct sockaddr_un sa_un;
#endif
};
typedef union WOLFSSL_BIO_ADDR WOLFSSL_BIO_ADDR;
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);
#endif /* WOLFSSL_HAVE_BIO_ADDR */
#endif /* USE_WOLFSSL_IO || HAVE_HTTP_CLIENT */ #endif /* USE_WOLFSSL_IO || HAVE_HTTP_CLIENT */
#ifndef WOLFSSL_NO_SOCK #ifndef WOLFSSL_NO_SOCK