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

Merge pull request #6931 from dgarske/async_v5.6.4

Browse Source 
Async v5.6.4
This commit is contained in:
JacobBarthelmeh
2023-10-31 14:52:13 -06:00
committed by GitHub
parent 37884f864d 2ac0d47908
commit 7435d235a6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/internal.c
View File

@ -7624,6 +7624,12 @@ int AllocKey(WOLFSSL* ssl, int type, void** pKey)
/* Sanity check key destination */ /* Sanity check key destination */
if (*pKey != NULL) { if (*pKey != NULL) {
WOLFSSL_MSG("Key already present!"); WOLFSSL_MSG("Key already present!");
#ifdef WOLFSSL_ASYNC_CRYPT
/* allow calling this again for async reentry */
if (ssl->error == WC_PENDING_E) {
return 0;
}
#endif
return BAD_STATE_E; return BAD_STATE_E;
} }
@ -38891,14 +38897,17 @@ int wolfSSL_AsyncPop(WOLFSSL* ssl, byte* state)
XMEMSET(&asyncDev->event, 0, sizeof(WOLF_EVENT)); XMEMSET(&asyncDev->event, 0, sizeof(WOLF_EVENT));
ssl->asyncDev = NULL; ssl->asyncDev = NULL;
} }
#if !defined(WOLFSSL_ASYNC_CRYPT_SW) && \ /* for crypto or PK callback, if pending remove from queue */
(defined(WOLF_CRYPTO_CB) || defined(HAVE_PK_CALLBACKS)) #if (defined(WOLF_CRYPTO_CB) || defined(HAVE_PK_CALLBACKS)) && \
!defined(WOLFSSL_ASYNC_CRYPT_SW) && !defined(HAVE_INTEL_QA) && \
!defined(HAVE_CAVIUM)
else if (ret == WC_PENDING_E) { else if (ret == WC_PENDING_E) {
/* Allow the underlying crypto API to be called again to trigger the /* Allow the underlying crypto API to be called again to trigger the
* crypto or PK callback. The actual callback must be called, since * crypto or PK callback. The actual callback must be called, since
* the completion is not detected in the poll like Intel QAT or * the completion is not detected in the poll like Intel QAT or
* Nitrox */ * Nitrox */
ret = wolfEventQueue_Remove(&ssl->ctx->event_queue, event); ret = wolfEventQueue_Remove(&ssl->ctx->event_queue, event);
} }
#endif #endif
} }

6
tests/api.c
View File

@ -36008,7 +36008,8 @@ static int test_wolfSSL_CTX_add_client_CA(void)
#endif /* OPENSSL_EXTRA && !NO_RSA && !NO_CERTS && !NO_WOLFSSL_CLIENT */ #endif /* OPENSSL_EXTRA && !NO_RSA && !NO_CERTS && !NO_WOLFSSL_CLIENT */
return EXPECT_RESULT(); return EXPECT_RESULT();
} }
#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) && \
defined(HAVE_IO_TESTS_DEPENDENCIES)
static THREAD_RETURN WOLFSSL_THREAD server_task_ech(void* args) static THREAD_RETURN WOLFSSL_THREAD server_task_ech(void* args)
{ {
callback_functions* callbacks = ((func_args*)args)->callbacks; callback_functions* callbacks = ((func_args*)args)->callbacks;
@ -68190,7 +68191,8 @@ TEST_CASE testCases[] = {
TEST_DECL(test_wolfSSL_wolfSSL_UseSecureRenegotiation), TEST_DECL(test_wolfSSL_wolfSSL_UseSecureRenegotiation),
TEST_DECL(test_wolfSSL_SCR_Reconnect), TEST_DECL(test_wolfSSL_SCR_Reconnect),
TEST_DECL(test_tls_ext_duplicate), TEST_DECL(test_tls_ext_duplicate),
#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) && \
defined(HAVE_IO_TESTS_DEPENDENCIES)
TEST_DECL(test_wolfSSL_Tls13_ECH_params), TEST_DECL(test_wolfSSL_Tls13_ECH_params),
/* Uses Assert in handshake callback. */ /* Uses Assert in handshake callback. */
TEST_DECL(test_wolfSSL_Tls13_ECH), TEST_DECL(test_wolfSSL_Tls13_ECH),