From cfd763722aec1883553c0ddc468e0535635aa080 Mon Sep 17 00:00:00 2001 From: Thomas Cook Date: Mon, 13 Apr 2026 13:18:06 -0400 Subject: [PATCH] Rework rsa accel a bit and turn it back on. --- wolfcrypt/src/port/nxp/casper_port.c | 2 +- wolfcrypt/src/rsa.c | 4 ++-- wolfssl/wolfcrypt/port/nxp/casper_port.h | 2 +- wolfssl/wolfcrypt/settings.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/port/nxp/casper_port.c b/wolfcrypt/src/port/nxp/casper_port.c index dc772766ea..925458832f 100644 --- a/wolfcrypt/src/port/nxp/casper_port.c +++ b/wolfcrypt/src/port/nxp/casper_port.c @@ -42,7 +42,7 @@ int wc_casper_init(void) return 0; } -#if !defined(NO_RSA) && !defined(WOLFSSL_NXP_CASPER_NO_RSA) +#if !defined(NO_RSA) && defined(WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD) #define CASPER_MAX_BUF_SZ 512 static uint8_t key_buf[CASPER_MAX_BUF_SZ]; diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 8df1031b7b..57b310f1b1 100644 --- a/wolfcrypt/src/rsa.c +++ b/wolfcrypt/src/rsa.c @@ -56,7 +56,7 @@ RSA keys can be used to encrypt, decrypt, sign and verify data. #ifdef WOLFSSL_HAVE_SP_RSA #include #endif -#if defined(WOLFSSL_NXP_CASPER) && !defined(WOLFSSL_NXP_CASPER_NO_RSA) +#if defined(WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD) #include #endif @@ -2415,7 +2415,7 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out, return ret; } -#elif defined(WOLFSSL_NXP_CASPER) && !defined(WOLFSSL_NXP_CASPER_NO_RSA) +#elif defined(WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD) static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out, word32* outLen, int type, RsaKey* key, WC_RNG* rng) diff --git a/wolfssl/wolfcrypt/port/nxp/casper_port.h b/wolfssl/wolfcrypt/port/nxp/casper_port.h index a61cd2be4a..b89ca6e982 100644 --- a/wolfssl/wolfcrypt/port/nxp/casper_port.h +++ b/wolfssl/wolfcrypt/port/nxp/casper_port.h @@ -25,7 +25,7 @@ int wc_casper_init(void); -#if !defined(NO_RSA) && !defined(WOLFSSL_NXP_CASPER_NO_RSA) +#if !defined(NO_RSA) && defined(WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD) #include diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index bb0b879a60..a4db8957ce 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2104,6 +2104,8 @@ extern void uITRON4_free(void *p) ; #define WOLFSSL_NXP_HASHCRYPT #define WOLFSSL_NXP_HASHCRYPT_SHA #define WOLFSSL_NXP_HASHCRYPT_SHA256 + #define WOLFSSL_NXP_CASPER + #define WOLFSSL_NXP_CASPER_RSA_PUB_EXPTMOD #endif #endif /* WOLFSSL_NXP_LPC55S69 */