Skip to content

Commit 97be040

Browse files
committed
Fix for using STM32 AES hardware crypto with WOLFSSL_ARMASM set (ZD 21262)
1 parent 134f63a commit 97be040

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

wolfcrypt/src/aes.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7707,7 +7707,10 @@ int wc_AesGcmSetKey(Aes* aes, const byte* key, word32 len)
77077707
return ret;
77087708
#endif /* WOLFSSL_RENESAS_RSIP && WOLFSSL_RENESAS_FSPSM_CRYPTONLY*/
77097709

7710-
#if defined(WOLFSSL_ARMASM)
7710+
/* STM32_CRYPTO stores raw key only (no expanded key schedule), so
7711+
* AES_ECB_encrypt (which expects expanded rounds) cannot be used.
7712+
* Fall through to wc_AesEncrypt path which uses STM32 CRYP hardware. */
7713+
#if defined(WOLFSSL_ARMASM) && !defined(STM32_CRYPTO)
77117714
if (ret == 0) {
77127715
#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
77137716
#if !defined(__aarch64__)

0 commit comments

Comments
 (0)