feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fix a couple stray WOLFSSL_NETWORK_INTROSPECTION gates that needed to be WOLFSSL_WOLFSENTRY_HOOKS.

Browse Source
This commit is contained in:
Daniel Pouzzner
2021-04-02 11:34:31 -05:00
parent 2a05fcb59a
commit 4458ed37c1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -5581,7 +5581,7 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
#endif #endif
#endif #endif
#ifdef WOLFSSL_NETWORK_INTROSPECTION #ifdef WOLFSSL_WOLFSENTRY_HOOKS
ssl->AcceptFilter = ctx->AcceptFilter; ssl->AcceptFilter = ctx->AcceptFilter;
ssl->AcceptFilter_arg = ctx->AcceptFilter_arg; ssl->AcceptFilter_arg = ctx->AcceptFilter_arg;
#endif #endif

4
src/ssl.c
View File

@@ -13125,7 +13125,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
} }
#endif /* OPENSSL_EXTRA || WOLFSSL_EITHER_SIDE */ #endif /* OPENSSL_EXTRA || WOLFSSL_EITHER_SIDE */
#ifdef WOLFSSL_NETWORK_INTROSPECTION #ifdef WOLFSSL_WOLFSENTRY_HOOKS
if (ssl->AcceptFilter && (ssl->buffers.network_connection.remote_addr_len > 0)) { if (ssl->AcceptFilter && (ssl->buffers.network_connection.remote_addr_len > 0)) {
wolfSSL_netfilter_decision_t res; wolfSSL_netfilter_decision_t res;
if ((ssl->AcceptFilter(ssl, &ssl->buffers.network_connection, ssl->AcceptFilter_arg, &res) == WOLFSSL_SUCCESS) && if ((ssl->AcceptFilter(ssl, &ssl->buffers.network_connection, ssl->AcceptFilter_arg, &res) == WOLFSSL_SUCCESS) &&
@@ -13142,7 +13142,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
} }
#endif /* WOLFSSL_NETWORK_INTROSPECTION */ #endif /* WOLFSSL_WOLFSENTRY_HOOKS */
#if defined(WOLFSSL_NO_TLS12) && defined(NO_OLD_TLS) && defined(WOLFSSL_TLS13) #if defined(WOLFSSL_NO_TLS12) && defined(NO_OLD_TLS) && defined(WOLFSSL_TLS13)
return wolfSSL_accept_TLSv13(ssl); return wolfSSL_accept_TLSv13(ssl);