wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

use WOLFSSL_BIO_ERROR, not SOCKET_INVALID (both macros have value -1), as the default/unset value of WOLFSSL_BIO.num, to avoid unnecessary dependency on HAVE_SOCKADDR.

Browse Source
This commit is contained in:
Daniel Pouzzner
2021-08-26 16:12:55 -05:00
parent 1e3d47af57
commit 220a255281
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@@ -57634,7 +57634,7 @@ int wolfSSL_CONF_cmd(WOLFSSL_CONF_CTX* cctx, const char* cmd, const char* value)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (b->num == SOCKET_INVALID) { if (b->num == WOLFSSL_BIO_ERROR) {
if (wolfIO_TcpBind(&sfd, b->port) < 0) { if (wolfIO_TcpBind(&sfd, b->port) < 0) {
WOLFSSL_ENTER("wolfIO_TcpBind error"); WOLFSSL_ENTER("wolfIO_TcpBind error");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
@@ -57921,7 +57921,7 @@ int wolfSSL_CONF_cmd(WOLFSSL_CONF_CTX* cctx, const char* cmd, const char* value)
bio->method = method; bio->method = method;
#endif #endif
bio->shutdown = BIO_CLOSE; /* default to close things */ bio->shutdown = BIO_CLOSE; /* default to close things */
bio->num = SOCKET_INVALID; /* Default to invalid socket */ bio->num = WOLFSSL_BIO_ERROR;
bio->init = 1; bio->init = 1;
if (method->type == WOLFSSL_BIO_MEMORY || if (method->type == WOLFSSL_BIO_MEMORY ||
method->type == WOLFSSL_BIO_BIO) { method->type == WOLFSSL_BIO_BIO) {
@@ -58070,7 +58070,7 @@ int wolfSSL_CONF_cmd(WOLFSSL_CONF_CTX* cctx, const char* cmd, const char* value)
if (bio->type == WOLFSSL_BIO_SSL && bio->ptr) if (bio->type == WOLFSSL_BIO_SSL && bio->ptr)
wolfSSL_free((WOLFSSL*)bio->ptr); wolfSSL_free((WOLFSSL*)bio->ptr);
#ifdef CloseSocket #ifdef CloseSocket
if (bio->type == WOLFSSL_BIO_SOCKET && bio->num) if ((bio->type == WOLFSSL_BIO_SOCKET) && (bio->num > 0))
CloseSocket(bio->num); CloseSocket(bio->num);
#endif #endif
} }
@@ -58082,7 +58082,7 @@ int wolfSSL_CONF_cmd(WOLFSSL_CONF_CTX* cctx, const char* cmd, const char* value)
} }
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR)\ #if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR)\
&& !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2) && !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
else if (bio->num != SOCKET_INVALID) { else if (bio->num != WOLFSSL_BIO_ERROR) {
XCLOSE(bio->num); XCLOSE(bio->num);
} }
#endif #endif
@@ -58253,7 +58253,7 @@ int wolfSSL_BIO_get_fd(WOLFSSL_BIO *bio, int* fd)
return bio->num; return bio->num;
} }
return SOCKET_INVALID; return WOLFSSL_BIO_ERROR;
} }
#ifdef HAVE_EX_DATA_CLEANUP_HOOKS #ifdef HAVE_EX_DATA_CLEANUP_HOOKS