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

Fix for async edge case with Intel QuickAssist/Cavium Nitrox that was broken in PR #6783. Was causing re-entry and multiple calls for some operations like DH KeyGen that don't advance state on completion. https://github.com/wolfSSL/wolfAsyncCrypt/pull/71

Browse Source
This commit is contained in:
David Garske
2023-10-31 12:43:12 -07:00
parent 0455224439
commit 2ac0d47908
1 changed files with 11 additions and 2 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
} }