feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for STM32 AES GCM, which was incorrectly using software crypto when authInSz != 16. The wc_AesGcmEncrypt_STM32 and wc_AesGcmDecrypt_STM32 functions correctly handle all variations of authInSz.

Browse Source
This commit is contained in:
David Garske
2019-02-19 15:38:09 -08:00
parent 25dd5882f8
commit ba14564c49
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/aes.c
View File

@ -5448,8 +5448,8 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
defined(WOLFSSL_STM32F7) || \ defined(WOLFSSL_STM32F7) || \
defined(WOLFSSL_STM32L4)) defined(WOLFSSL_STM32L4))
/* STM32 HW only supports 12 byte IV and 16 byte auth */ /* STM32 HW only supports 12 byte IV */
if (ivSz == GCM_NONCE_MID_SZ && authInSz == AES_BLOCK_SIZE) { if (ivSz == GCM_NONCE_MID_SZ) {
return wc_AesGcmEncrypt_STM32(aes, out, in, sz, iv, ivSz, return wc_AesGcmEncrypt_STM32(aes, out, in, sz, iv, ivSz,
authTag, authTagSz, authIn, authInSz); authTag, authTagSz, authIn, authInSz);
} }
@ -5851,8 +5851,8 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
defined(WOLFSSL_STM32F7) || \ defined(WOLFSSL_STM32F7) || \
defined(WOLFSSL_STM32L4)) defined(WOLFSSL_STM32L4))
/* STM32 HW only supports 12 byte IV and 16 byte auth */ /* STM32 HW only supports 12 byte IV */
if (ivSz == GCM_NONCE_MID_SZ && authInSz == AES_BLOCK_SIZE) { if (ivSz == GCM_NONCE_MID_SZ) {
return wc_AesGcmDecrypt_STM32(aes, out, in, sz, iv, ivSz, return wc_AesGcmDecrypt_STM32(aes, out, in, sz, iv, ivSz,
authTag, authTagSz, authIn, authInSz); authTag, authTagSz, authIn, authInSz);
} }