Add ability to switch to STD RSA method

wolfcrypt/src/aes.c

@@ -4395,7 +4395,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
                 return BAD_FUNC_ARG;
             }
 
-            return wc_AesSetKey(aes, key, len, iv, dir);
+            return wc_AesSetKeyLocal(aes, key, len, iv, dir, 0);
         }
 
     #endif /* NEED_AES_CTR_SOFT */

wolfcrypt/src/random.c

@@ -1972,7 +1972,6 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
     int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
     {
         int ret;
-        word32 retVal;
         RNG_HandleTypeDef hrng;
         word32 i = 0;
         (void)os;
@@ -2005,9 +2004,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
             }
             else {
                 /* Use native 32 instruction */
-                retVal = HAL_RNG_GenerateRandomNumber(&hrng,
-                                                    (uint32_t*)&output[i]);
-                if (retVal != HAL_OK) {
+                if (HAL_RNG_GenerateRandomNumber(&hrng, (uint32_t*)&output[i]) != HAL_OK) {
                     wolfSSL_CryptHwMutexUnLock();
                     return RAN_BLOCK_E;
                 }

wolfcrypt/src/rsa.c

@@ -2271,7 +2271,10 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
     #endif
     #ifndef RSA_LOW_MEM
             if ((mp_count_bits(&key->p) == 1024) &&
-                                             (mp_count_bits(&key->q) == 1024)) {
+                    (mp_count_bits(&key->q) == 1024) &&
+                    (mp_count_bits(&key->dP) > 0) &&
+                    (mp_count_bits(&key->dQ) > 0) &&
+                    (mp_count_bits(&key->u) > 0)) {
                 return sp_RsaPrivate_2048(in, inLen, &key->d, &key->p, &key->q,
                                           &key->dP, &key->dQ, &key->u, &key->n,
                                           out, outLen);
@@ -2302,7 +2305,10 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
     #endif
     #ifndef RSA_LOW_MEM
             if ((mp_count_bits(&key->p) == 1536) &&
-                                             (mp_count_bits(&key->q) == 1536)) {
+                    (mp_count_bits(&key->q) == 1536) &&
+                    (mp_count_bits(&key->dP) > 0) &&
+                    (mp_count_bits(&key->dQ) > 0) &&
+                    (mp_count_bits(&key->u) > 0)) {
                 return sp_RsaPrivate_3072(in, inLen, &key->d, &key->p, &key->q,
                                           &key->dP, &key->dQ, &key->u, &key->n,
                                           out, outLen);
@@ -2333,7 +2339,10 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
     #endif
     #ifndef RSA_LOW_MEM
             if ((mp_count_bits(&key->p) == 2048) &&
-                                             (mp_count_bits(&key->q) == 2048)) {
+                    (mp_count_bits(&key->q) == 2048) &&
+                    (mp_count_bits(&key->dP) > 0) &&
+                    (mp_count_bits(&key->dQ) > 0) &&
+                    (mp_count_bits(&key->u) > 0)) {
                 return sp_RsaPrivate_4096(in, inLen, &key->d, &key->p, &key->q,
                                           &key->dP, &key->dQ, &key->u, &key->n,
                                           out, outLen);
@@ -2434,7 +2443,13 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
             if (ret == 0 && mp_exptmod(tmp, &key->d, &key->n, tmp) != MP_OKAY)
                 ret = MP_EXPTMOD_E;
         #else
-            if (ret == 0) {
+            if (ret == 0 && (mp_iszero(&key->p) || mp_iszero(&key->q) ||
+                    mp_iszero(&key->dP) || mp_iszero(&key->dQ))) {
+                if (mp_exptmod(tmp, &key->d, &key->n, tmp) != MP_OKAY) {
+                    ret = MP_EXPTMOD_E;
+                }
+            }
+            else if (ret == 0) {
             #ifdef WOLFSSL_SMALL_STACK
                 mp_int* tmpa;
                 mp_int* tmpb = NULL;

wolfcrypt/src/sha.c

@@ -137,7 +137,7 @@
         ret = wolfSSL_CryptHwMutexLock();
         if (ret == 0) {
             ret = wc_Stm32_Hash_Update(&sha->stmCtx, HASH_AlgoSelection_SHA1,
-                data, len, WC_SHA_BLOCK_SIZE);
+                data, len);
             wolfSSL_CryptHwMutexUnLock();
         }
         return ret;

wolfcrypt/src/sha256.c

@@ -553,7 +553,7 @@ static int InitSha256(wc_Sha256* sha256)
         ret = wolfSSL_CryptHwMutexLock();
         if (ret == 0) {
             ret = wc_Stm32_Hash_Update(&sha256->stmCtx,
-                HASH_AlgoSelection_SHA256, data, len, WC_SHA256_BLOCK_SIZE);
+                HASH_AlgoSelection_SHA256, data, len);
             wolfSSL_CryptHwMutexUnLock();
         }
         return ret;
@@ -1384,7 +1384,7 @@ static int InitSha256(wc_Sha256* sha256)
         ret = wolfSSL_CryptHwMutexLock();
         if (ret == 0) {
             ret = wc_Stm32_Hash_Update(&sha224->stmCtx,
-                HASH_AlgoSelection_SHA224, data, len, WC_SHA224_BLOCK_SIZE);
+                HASH_AlgoSelection_SHA224, data, len);
             wolfSSL_CryptHwMutexUnLock();
         }
         return ret;

wolfssl/wolfcrypt/port/st/stm32.h

@@ -1,6 +1,6 @@
 /* stm32.h
  *
- * Copyright (C) 2006-2025 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL.
  *
@@ -26,7 +26,7 @@
 /* Supports CubeMX HAL or Standard Peripheral Library */
 
 #include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/types.h> /* for MATH_INT_T */
+#include <wolfssl/wolfcrypt/types.h>
 
 #ifdef STM32_HASH
 
@@ -35,24 +35,10 @@
 #ifdef HASH_DIGEST
     /* The HASH_DIGEST register indicates SHA224/SHA256 support */
     #define STM32_HASH_SHA2
-    #if defined(WOLFSSL_STM32H5) || defined(WOLFSSL_STM32MP13)
-        #define HASH_CR_SIZE    103
-        #define HASH_MAX_DIGEST 64 /* Up to SHA512 */
-    #else
-        #define HASH_CR_SIZE    54
-        #define HASH_MAX_DIGEST 32
-    #endif
-    #if defined(WOLFSSL_STM32MP13) || defined(WOLFSSL_STM32H7S)
-        #define STM32_HASH_SHA512
-        #define STM32_HASH_SHA512_224
-        #define STM32_HASH_SHA512_256
-        #define STM32_HASH_SHA384
-    #endif
-    #if defined(WOLFSSL_STM32MP13)
-        #define STM32_HASH_SHA3
-    #endif
+    #define HASH_CR_SIZE 54
+    #define HASH_MAX_DIGEST 32
 #else
-    #define HASH_CR_SIZE    50
+    #define HASH_CR_SIZE 50
     #define HASH_MAX_DIGEST 20
 #endif
 
@@ -60,15 +46,11 @@
 #if !defined(HASH_ALGOMODE_HASH) && defined(HASH_AlgoMode_HASH)
     #define HASH_ALGOMODE_HASH HASH_AlgoMode_HASH
 #endif
-#if !defined(HASH_DATATYPE_8B)
-    #if defined(HASH_DataType_8b)
-        #define HASH_DATATYPE_8B HASH_DataType_8b
-    #elif defined(HASH_BYTE_SWAP)
-        #define HASH_DATATYPE_8B HASH_BYTE_SWAP
-    #endif
+#if !defined(HASH_DATATYPE_8B) && defined(HASH_DataType_8b)
+    #define HASH_DATATYPE_8B HASH_DataType_8b
 #endif
 #ifndef HASH_STR_NBW
-    #define HASH_STR_NBW HASH_STR_NBLW
+	#define HASH_STR_NBW HASH_STR_NBLW
 #endif
 
 #ifndef STM32_HASH_TIMEOUT
@@ -78,15 +60,6 @@
 
 /* STM32 register size in bytes */
 #define STM32_HASH_REG_SIZE  4
-/* Maximum FIFO buffer is 64 bits for SHA256, 128 bits for SHA512 and 144 bits
- * for SHA3 */
-#if defined(STM32_HASH_SHA3)
-    #define STM32_HASH_FIFO_SIZE 36
-#elif defined(STM32_HASH_SHA512) || defined(STM32_HASH_SHA384)
-    #define STM32_HASH_FIFO_SIZE 32
-#else
-    #define STM32_HASH_FIFO_SIZE 16
-#endif
 
 /* STM32 Hash Context */
 typedef struct {
@@ -95,90 +68,53 @@ typedef struct {
     uint32_t HASH_STR;
     uint32_t HASH_CR;
     uint32_t HASH_CSR[HASH_CR_SIZE];
-#ifdef STM32_HASH_SHA3
-    uint32_t SHA3CFGR;
-#endif
 
     /* Hash state / buffers */
-    word32 buffer[STM32_HASH_FIFO_SIZE+1]; /* partial word buffer */
+    word32 buffer[STM32_HASH_REG_SIZE / sizeof(word32)]; /* partial word buffer */
     word32 buffLen; /* partial word remain */
     word32 loLen;   /* total update bytes
                  (only lsb 6-bits is used for nbr valid bytes in last word) */
-    word32 fifoBytes; /* number of currently filled FIFO bytes */
 } STM32_HASH_Context;
 
 
 /* API's */
 void wc_Stm32_Hash_Init(STM32_HASH_Context* stmCtx);
 int  wc_Stm32_Hash_Update(STM32_HASH_Context* stmCtx, word32 algo,
-    const byte* data, word32 len, word32 blockSize);
+    const byte* data, int len);
 int  wc_Stm32_Hash_Final(STM32_HASH_Context* stmCtx, word32 algo,
-    byte* hash, word32 digestSize);
+    byte* hash, int digestSize);
 
 #endif /* STM32_HASH */
 
 
 #ifdef STM32_CRYPTO
 
-#if defined(WOLFSSL_STM32MP13)
-    #define RNG RNG1
-    #define CRYP CRYP1
-    #define hcryp hcryp1
-    #define FORMAT_BIN RTC_FORMAT_BIN
-    #define __HAL_RCC_RNG_CLK_ENABLE __HAL_RCC_RNG1_CLK_ENABLE
-    #define __HAL_RCC_HASH_CLK_ENABLE __HAL_RCC_HASH1_CLK_ENABLE
-    #define __HAL_RCC_HASH_CLK_DISABLE __HAL_RCC_HASH1_CLK_DISABLE
-    /* From stm32_hal_legacy.h, but that header has a bug in it */
-    #define HASH_AlgoSelection_MD5       HASH_ALGOSELECTION_MD5
-    #define HASH_AlgoSelection_SHA1      HASH_ALGOSELECTION_SHA1
-    #define HASH_AlgoSelection_SHA224    HASH_ALGOSELECTION_SHA224
-    #define HASH_AlgoSelection_SHA256    HASH_ALGOSELECTION_SHA256
-
-    #define STM32_NOMD5 /* The HASH HAL has no MD5 implementation */
-#endif
-
 #ifndef NO_AES
     #if !defined(STM32_CRYPTO_AES_GCM) && (defined(WOLFSSL_STM32F4) || \
             defined(WOLFSSL_STM32F7) || defined(WOLFSSL_STM32L4) || \
-            defined(WOLFSSL_STM32L5) || defined(WOLFSSL_STM32H7) || \
-            defined(WOLFSSL_STM32U5) || defined(WOLFSSL_STM32H5) || \
-            defined(WOLFSSL_STM32MP13) || defined(WOLFSSL_STM32H7S) || \
-            defined(WOLFSSL_STM32N6))
+			defined(WOLFSSL_STM32L5) || defined(WOLFSSL_STM32H7))
         /* Hardware supports AES GCM acceleration */
         #define STM32_CRYPTO_AES_GCM
     #endif
 
-    #if defined(WOLFSSL_STM32WB) || defined(WOLFSSL_STM32WL) || \
-        defined(WOLFSSL_STM32WBA)
+    #if defined(WOLFSSL_STM32WB)
         #define STM32_CRYPTO_AES_ONLY /* crypto engine only supports AES */
-        #ifdef WOLFSSL_STM32WB
-            #define CRYP AES1
-        #else
-            #define CRYP AES
-        #endif
+        #define CRYP AES1
         #define STM32_HAL_V2
     #endif
-    #if defined(WOLFSSL_STM32L4) || defined(WOLFSSL_STM32L5) || \
-        defined(WOLFSSL_STM32U5) || defined(WOLFSSL_STM32H5)
-        #if defined(WOLFSSL_STM32L4) || defined(WOLFSSL_STM32U5)
-            #define STM32_CRYPTO_AES_ONLY /* crypto engine only supports AES */
-        #endif
-        #if defined(WOLFSSL_STM32H5)
-            #define __HAL_RCC_CRYP_CLK_DISABLE  __HAL_RCC_AES_CLK_DISABLE
-            #define __HAL_RCC_CRYP_CLK_ENABLE   __HAL_RCC_AES_CLK_ENABLE
-        #endif
+    #if defined(WOLFSSL_STM32L4) || defined(WOLFSSL_STM32L5)
+		#ifdef WOLFSSL_STM32L4
+        	#define STM32_CRYPTO_AES_ONLY /* crypto engine only supports AES */
+		#endif
         #define CRYP AES
-        #ifndef CRYP_AES_GCM
-            #define CRYP_AES_GCM CRYP_AES_GCM_GMAC
-        #endif
+		#ifndef CRYP_AES_GCM
+			#define CRYP_AES_GCM CRYP_AES_GCM_GMAC
+		#endif
     #endif
 
     /* Detect newer CubeMX crypto HAL (HAL_CRYP_Encrypt / HAL_CRYP_Decrypt) */
     #if !defined(STM32_HAL_V2) && defined(CRYP_AES_GCM) && \
-        (defined(WOLFSSL_STM32F7) || defined(WOLFSSL_STM32L5) || \
-         defined(WOLFSSL_STM32H7) || defined(WOLFSSL_STM32U5) || \
-         defined(WOLFSSL_STM32H5) || defined(WOLFSSL_STM32MP13) || \
-         defined(WOLFSSL_STM32H7S) || defined(WOLFSSL_STM32N6))
+        (defined(WOLFSSL_STM32F7) || defined(WOLFSSL_STM32L5) || defined(WOLFSSL_STM32H7))
         #define STM32_HAL_V2
     #endif
 
@@ -189,34 +125,31 @@ int  wc_Stm32_Hash_Final(STM32_HASH_Context* stmCtx, word32 algo,
         #define STM_CRYPT_TYPE uint8_t
     #endif
 
-    /* Determine minimum AES GCM alignment supported */
-    #ifndef STM_CRYPT_HEADER_WIDTH
-        /* newer crypt HAL requires auth header size as 4 bytes (word) */
-        #if defined(CRYP_HEADERWIDTHUNIT_BYTE) && \
-            !defined(WOLFSSL_STM32MP13) && !defined(WOLFSSL_STM32H7S)
-            #define STM_CRYPT_HEADER_WIDTH 1
-        #else
-            #define STM_CRYPT_HEADER_WIDTH 4
-        #endif
-    #endif
-
     /* CRYPT_AES_GCM starts the IV with 2 */
     #define STM32_GCM_IV_START 2
 
     struct Aes;
     #ifdef WOLFSSL_STM32_CUBEMX
         int wc_Stm32_Aes_Init(struct Aes* aes, CRYP_HandleTypeDef* hcryp);
-        void wc_Stm32_Aes_Cleanup(void);
     #else /* Standard Peripheral Library */
         int wc_Stm32_Aes_Init(struct Aes* aes, CRYP_InitTypeDef* cryptInit,
             CRYP_KeyInitTypeDef* keyInit);
-        void wc_Stm32_Aes_Cleanup(void);
     #endif /* WOLFSSL_STM32_CUBEMX */
 #endif /* !NO_AES */
 
 #endif /* STM32_CRYPTO */
 
 #if defined(WOLFSSL_STM32_PKA) && defined(HAVE_ECC)
+#ifdef WOLFSSL_SP_MATH
+    struct sp_int;
+    #define MATH_INT_T struct sp_int
+#elif defined(USE_FAST_MATH)
+    struct fp_int;
+    #define MATH_INT_T struct fp_int
+#else
+    struct mp_int;
+	#define MATH_INT_T struct mp_int
+#endif
 struct ecc_key;
 struct WC_RNG;