Skip to content

Run one point operation per SP ECC non-blocking step #12025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dgarske wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Run one point operation per SP ECC non-blocking step #12025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10083,20 +10083,64 @@ int AllocKey(WOLFSSL* ssl, int type, void** pKey)
static int ReuseKey(WOLFSSL* ssl, int type, void* pKey)
{
int ret = 0;
#if defined(WC_RSA_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_RSA)
RsaNb* rsaNb;
#endif
#if defined(WC_ECC_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_ECC)
ecc_nb_ctx_t* eccNbCtx;
#endif
#if defined(WC_X25519_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_X25519)
x25519_nb_ctx_t* x25519NbCtx;
#endif

(void)ssl;

switch (type) {
#ifndef NO_RSA
case DYNAMIC_TYPE_RSA:
#if defined(WC_RSA_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_RSA)
rsaNb = ((RsaKey*)pKey)->nb;
#endif
wc_FreeRsaKey((RsaKey*)pKey);
ret = wc_InitRsaKey_ex((RsaKey*)pKey, ssl->heap, ssl->devId);
#if defined(WC_RSA_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_RSA)
if (rsaNb != NULL) {
if (ret == 0) {
ret = wc_RsaSetNonBlock((RsaKey*)pKey, rsaNb);
}
if (ret != 0) {
XFREE(rsaNb, ssl->heap, DYNAMIC_TYPE_TMP_BUFFER);
}
}
#endif
break;
#endif /* ! NO_RSA */
#ifdef HAVE_ECC
case DYNAMIC_TYPE_ECC:
#if defined(WC_ECC_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_ECC)
/* Keep the non-blocking context AllocKey attached; init clears it
* from the key. */
eccNbCtx = ((ecc_key*)pKey)->nb_ctx;
#endif
wc_ecc_free((ecc_key*)pKey);
ret = wc_ecc_init_ex((ecc_key*)pKey, ssl->heap, ssl->devId);
#if defined(WC_ECC_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_ECC)
if (eccNbCtx != NULL) {
if (ret == 0) {
ret = wc_ecc_set_nonblock((ecc_key*)pKey, eccNbCtx);
}
if (ret != 0) {
XFREE(eccNbCtx, ssl->heap, DYNAMIC_TYPE_TMP_BUFFER);
}
}
#endif
break;
#endif /* HAVE_ECC */
#ifdef HAVE_ED25519
Expand All @@ -10108,9 +10152,25 @@ static int ReuseKey(WOLFSSL* ssl, int type, void* pKey)
#endif /* HAVE_CURVE25519 */
#ifdef HAVE_CURVE25519
case DYNAMIC_TYPE_CURVE25519:
#if defined(WC_X25519_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_X25519)
x25519NbCtx = ((curve25519_key*)pKey)->nb_ctx;
#endif
wc_curve25519_free((curve25519_key*)pKey);
ret = wc_curve25519_init_ex((curve25519_key*)pKey, ssl->heap,
ssl->devId);
#if defined(WC_X25519_NONBLOCK) && defined(WOLFSSL_ASYNC_CRYPT_SW) && \
defined(WC_ASYNC_ENABLE_X25519)
if (x25519NbCtx != NULL) {
if (ret == 0) {
ret = wc_curve25519_set_nonblock((curve25519_key*)pKey,
x25519NbCtx);
}
if (ret != 0) {
XFREE(x25519NbCtx, ssl->heap, DYNAMIC_TYPE_TMP_BUFFER);
}
}
#endif
break;
#endif /* HAVE_CURVE25519 */
#ifdef HAVE_ED448
Expand Down
Loading
Loading