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

Merge pull request #5412 from douzzer/20220726-multi-test-fixes

Browse Source 
20220726-multi-test-fixes
This commit is contained in:
David Garske
2022-07-27 20:44:46 -07:00
committed by GitHub
parent 7b65a1f1c2 9256d6aa7c
commit 824d44b705
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -18124,7 +18124,7 @@ int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
if(IsAtLeastTLSv1_3(ssl->version)) { if(IsAtLeastTLSv1_3(ssl->version)) {
#ifdef WOLFSSL_DTLS13 #ifdef WOLFSSL_DTLS13
ret = Dtls13ProcessBufferedMessages(ssl); ret = Dtls13ProcessBufferedMessages(ssl);
#elif #else
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
} }
@ -23272,7 +23272,6 @@ int SetCipherList(WOLFSSL_CTX* ctx, Suites* suites, const char* list)
haveStaticECC = 1; haveStaticECC = 1;
haveStaticRSA = 1; haveStaticRSA = 1;
haveRSAsig = 1; haveRSAsig = 1;
haveECDSAsig = 1;
havePSK = 1; havePSK = 1;
haveNull = 0; haveNull = 0;
@ -23296,7 +23295,6 @@ int SetCipherList(WOLFSSL_CTX* ctx, Suites* suites, const char* list)
haveStaticECC = 0; haveStaticECC = 0;
haveStaticRSA = 0; haveStaticRSA = 0;
haveRSAsig = 1; haveRSAsig = 1;
haveECDSAsig = 1;
havePSK = 1; havePSK = 1;
haveNull = 0; haveNull = 0;

2
src/pk.c
View File

@ -2637,7 +2637,7 @@ int wolfSSL_RSA_set_ex_data_with_cleanup(WOLFSSL_RSA *rsa, int idx, void *data,
{ {
WOLFSSL_ENTER("wolfSSL_RSA_set_ex_data_with_cleanup"); WOLFSSL_ENTER("wolfSSL_RSA_set_ex_data_with_cleanup");
return (rsa == NULL) ? NULL : return (rsa == NULL) ? 0 :
wolfSSL_CRYPTO_set_ex_data_with_cleanup(&rsa->ex_data, idx, data, wolfSSL_CRYPTO_set_ex_data_with_cleanup(&rsa->ex_data, idx, data,
freeCb); freeCb);
} }

11
src/ssl.c
View File

@ -11853,7 +11853,8 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
#endif #endif
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
if (ssl->ConnectFilter) { if ((ssl->ConnectFilter != NULL) &&
(ssl->options.connectState == CONNECT_BEGIN)) {
wolfSSL_netfilter_decision_t res; wolfSSL_netfilter_decision_t res;
if ((ssl->ConnectFilter(ssl, ssl->ConnectFilter_arg, &res) == if ((ssl->ConnectFilter(ssl, ssl->ConnectFilter_arg, &res) ==
WOLFSSL_SUCCESS) && WOLFSSL_SUCCESS) &&
@ -12324,7 +12325,13 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
WOLFSSL_ENTER("SSL_accept()"); WOLFSSL_ENTER("SSL_accept()");
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
if (ssl->AcceptFilter) { if ((ssl->AcceptFilter != NULL) &&
((ssl->options.acceptState == ACCEPT_BEGIN)
#ifdef HAVE_SECURE_RENEGOTIATION
|| (ssl->options.acceptState == ACCEPT_BEGIN_RENEG)
#endif
))
{
wolfSSL_netfilter_decision_t res; wolfSSL_netfilter_decision_t res;
if ((ssl->AcceptFilter(ssl, ssl->AcceptFilter_arg, &res) == if ((ssl->AcceptFilter(ssl, ssl->AcceptFilter_arg, &res) ==
WOLFSSL_SUCCESS) && WOLFSSL_SUCCESS) &&

12
src/tls13.c
View File

@ -9746,7 +9746,9 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
if (ssl->ConnectFilter) { if ((ssl->ConnectFilter != NULL) &&
(ssl->options.connectState == CONNECT_BEGIN))
{
wolfSSL_netfilter_decision_t res; wolfSSL_netfilter_decision_t res;
if ((ssl->ConnectFilter(ssl, ssl->ConnectFilter_arg, &res) == if ((ssl->ConnectFilter(ssl, ssl->ConnectFilter_arg, &res) ==
WOLFSSL_SUCCESS) && WOLFSSL_SUCCESS) &&
@ -10781,7 +10783,13 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_WOLFSENTRY_HOOKS #ifdef WOLFSSL_WOLFSENTRY_HOOKS
if (ssl->AcceptFilter) { if ((ssl->AcceptFilter != NULL) &&
((ssl->options.acceptState == TLS13_ACCEPT_BEGIN)
#ifdef HAVE_SECURE_RENEGOTIATION
|| (ssl->options.acceptState == TLS13_ACCEPT_BEGIN_RENEG)
#endif
))
{
wolfSSL_netfilter_decision_t res; wolfSSL_netfilter_decision_t res;
if ((ssl->AcceptFilter(ssl, ssl->AcceptFilter_arg, &res) == if ((ssl->AcceptFilter(ssl, ssl->AcceptFilter_arg, &res) ==
WOLFSSL_SUCCESS) && WOLFSSL_SUCCESS) &&