wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7485 from dgarske/pkcs11_async

Browse Source 
Improved the prioritization of crypto callback vs async crypt in ECC …
This commit is contained in:
Sean Parkinson
2024-04-30 08:41:14 +10:00
committed by GitHub
parent bd9a27a39b 5af0b1e83b
commit 5cc05956d5
4 changed files with 21 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
wolfcrypt/src/ecc.c
View File

@@ -6094,20 +6094,11 @@ WOLFSSL_ABI
int wc_ecc_init_ex(ecc_key* key, void* heap, int devId) int wc_ecc_init_ex(ecc_key* key, void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_PKCS11)
int isPkcs11 = 0;
#endif
if (key == NULL) { if (key == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(HAVE_PKCS11)
if (key->isPkcs11) {
isPkcs11 = 1;
}
#endif
#ifdef ECC_DUMP_OID #ifdef ECC_DUMP_OID
wc_ecc_dump_oids(); wc_ecc_dump_oids();
#endif #endif
@@ -6161,16 +6152,17 @@ int wc_ecc_init_ex(ecc_key* key, void* heap, int devId)
#endif #endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC)
#if defined(HAVE_PKCS11) #ifdef WOLF_CRYPTO_CB
if (!isPkcs11) /* prefer crypto callback */
if (key->devId != INVALID_DEVID)
#endif #endif
{ {
/* handle as async */ /* handle as async */
ret = wolfAsync_DevCtxInit(&key->asyncDev, WOLFSSL_ASYNC_MARKER_ECC, ret = wolfAsync_DevCtxInit(&key->asyncDev, WOLFSSL_ASYNC_MARKER_ECC,
key->heap, devId); key->heap, devId);
} }
#elif defined(HAVE_PKCS11) if (ret != 0)
(void)isPkcs11; return ret;
#endif #endif
#if defined(WOLFSSL_DSP) #if defined(WOLFSSL_DSP)
@@ -6222,12 +6214,6 @@ int wc_ecc_init_id(ecc_key* key, unsigned char* id, int len, void* heap,
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
if (ret == 0 && (len < 0 || len > ECC_MAX_ID_LEN)) if (ret == 0 && (len < 0 || len > ECC_MAX_ID_LEN))
ret = BUFFER_E; ret = BUFFER_E;
#if defined(HAVE_PKCS11)
XMEMSET(key, 0, sizeof(ecc_key));
key->isPkcs11 = 1;
#endif
if (ret == 0) if (ret == 0)
ret = wc_ecc_init_ex(key, heap, devId); ret = wc_ecc_init_ex(key, heap, devId);
if (ret == 0 && id != NULL && len != 0) { if (ret == 0 && id != NULL && len != 0) {
@@ -6257,12 +6243,6 @@ int wc_ecc_init_label(ecc_key* key, const char* label, void* heap, int devId)
if (labelLen == 0 || labelLen > ECC_MAX_LABEL_LEN) if (labelLen == 0 || labelLen > ECC_MAX_LABEL_LEN)
ret = BUFFER_E; ret = BUFFER_E;
} }
#if defined(HAVE_PKCS11)
XMEMSET(key, 0, sizeof(ecc_key));
key->isPkcs11 = 1;
#endif
if (ret == 0) if (ret == 0)
ret = wc_ecc_init_ex(key, heap, devId); ret = wc_ecc_init_ex(key, heap, devId);
if (ret == 0) { if (ret == 0) {
@@ -7177,7 +7157,7 @@ int wc_ecc_sign_hash_ex(const byte* in, word32 inlen, WC_RNG* rng,
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \ #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \
defined(WOLFSSL_ASYNC_CRYPT_SW) defined(WOLFSSL_ASYNC_CRYPT_SW)
if (key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_ECC) { if (key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_ECC) {
if (wc_AsyncSwInit(&key->asyncDev, ASYNC_SW_ECC_SIGN)) { if (wc_AsyncSwInit(&key->asyncDev, ASYNC_SW_ECC_SIGN)) {
WC_ASYNC_SW* sw = &key->asyncDev.sw; WC_ASYNC_SW* sw = &key->asyncDev.sw;

46
wolfcrypt/src/rsa.c
View File

@@ -153,20 +153,11 @@ static void wc_RsaCleanup(RsaKey* key)
int wc_InitRsaKey_ex(RsaKey* key, void* heap, int devId) int wc_InitRsaKey_ex(RsaKey* key, void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_PKCS11)
int isPkcs11 = 0;
#endif
if (key == NULL) { if (key == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(HAVE_PKCS11)
if (key->isPkcs11) {
isPkcs11 = 1;
}
#endif
XMEMSET(key, 0, sizeof(RsaKey)); XMEMSET(key, 0, sizeof(RsaKey));
key->type = RSA_TYPE_UNKNOWN; key->type = RSA_TYPE_UNKNOWN;
@@ -193,19 +184,18 @@ int wc_InitRsaKey_ex(RsaKey* key, void* heap, int devId)
#endif #endif
#ifdef WC_ASYNC_ENABLE_RSA #ifdef WC_ASYNC_ENABLE_RSA
#if defined(HAVE_PKCS11) #ifdef WOLF_CRYPTO_CB
if (!isPkcs11) /* prefer crypto callback */
if (key->devId != INVALID_DEVID)
#endif #endif
{ {
/* handle as async */ /* handle as async */
ret = wolfAsync_DevCtxInit(&key->asyncDev, ret = wolfAsync_DevCtxInit(&key->asyncDev,
WOLFSSL_ASYNC_MARKER_RSA, key->heap, devId); WOLFSSL_ASYNC_MARKER_RSA, key->heap, devId);
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
#endif /* WC_ASYNC_ENABLE_RSA */ #endif /* WC_ASYNC_ENABLE_RSA */
#elif defined(HAVE_PKCS11)
(void)isPkcs11;
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
#ifndef WOLFSSL_RSA_PUBLIC_ONLY #ifndef WOLFSSL_RSA_PUBLIC_ONLY
@@ -278,14 +268,6 @@ int wc_InitRsaKey_Id(RsaKey* key, unsigned char* id, int len, void* heap,
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
if (ret == 0 && (len < 0 || len > RSA_MAX_ID_LEN)) if (ret == 0 && (len < 0 || len > RSA_MAX_ID_LEN))
ret = BUFFER_E; ret = BUFFER_E;
#if defined(HAVE_PKCS11)
if (ret == 0) {
XMEMSET(key, 0, sizeof(RsaKey));
key->isPkcs11 = 1;
}
#endif
if (ret == 0) if (ret == 0)
ret = wc_InitRsaKey_ex(key, heap, devId); ret = wc_InitRsaKey_ex(key, heap, devId);
if (ret == 0 && id != NULL && len != 0) { if (ret == 0 && id != NULL && len != 0) {
@@ -315,14 +297,6 @@ int wc_InitRsaKey_Label(RsaKey* key, const char* label, void* heap, int devId)
if (labelLen == 0 || labelLen > RSA_MAX_LABEL_LEN) if (labelLen == 0 || labelLen > RSA_MAX_LABEL_LEN)
ret = BUFFER_E; ret = BUFFER_E;
} }
#if defined(HAVE_PKCS11)
if (ret == 0) {
XMEMSET(key, 0, sizeof(RsaKey));
key->isPkcs11 = 1;
}
#endif
if (ret == 0) if (ret == 0)
ret = wc_InitRsaKey_ex(key, heap, devId); ret = wc_InitRsaKey_ex(key, heap, devId);
if (ret == 0) { if (ret == 0) {

3
wolfssl/wolfcrypt/ecc.h
View File

@@ -519,9 +519,6 @@ struct ecc_key {
void* devCtx; void* devCtx;
int devId; int devId;
#endif #endif
#if defined(HAVE_PKCS11)
byte isPkcs11 : 1; /* indicate if PKCS11 is preferred */
#endif
#ifdef WOLFSSL_SILABS_SE_ACCEL #ifdef WOLFSSL_SILABS_SE_ACCEL
sl_se_command_context_t cmd_ctx; sl_se_command_context_t cmd_ctx;
sl_se_key_descriptor_t key; sl_se_key_descriptor_t key;

3
wolfssl/wolfcrypt/rsa.h
View File

@@ -217,9 +217,6 @@ struct RsaKey {
void* devCtx; void* devCtx;
int devId; int devId;
#endif #endif
#if defined(HAVE_PKCS11)
byte isPkcs11 : 1; /* indicate if PKCS11 is preferred */
#endif
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
WC_ASYNC_DEV asyncDev; WC_ASYNC_DEV asyncDev;
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN