wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for STM32 CubeMX AES GCM crypto hardware where less than a block size (16) is used.

Browse Source
This commit is contained in:
David Garske
2019-07-18 06:09:07 -07:00
parent 8b6e66f095
commit 7db3f8e2c6
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wolfcrypt/src/aes.c
View File

@ -5323,7 +5323,7 @@ static int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in, word32 sz
word32 keyCopy[AES_256_KEY_SIZE/sizeof(word32)]; word32 keyCopy[AES_256_KEY_SIZE/sizeof(word32)];
#endif #endif
word32 keySize; word32 keySize;
int status = 0; int status = HAL_OK;
word32 blocks = sz / AES_BLOCK_SIZE; word32 blocks = sz / AES_BLOCK_SIZE;
word32 partial = sz % AES_BLOCK_SIZE; word32 partial = sz % AES_BLOCK_SIZE;
byte tag[AES_BLOCK_SIZE]; byte tag[AES_BLOCK_SIZE];
@ -5390,8 +5390,10 @@ static int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in, word32 sz
if (status == HAL_OK) { if (status == HAL_OK) {
/* GCM payload phase - blocks */ /* GCM payload phase - blocks */
hcryp.Init.GCMCMACPhase = CRYP_PAYLOAD_PHASE; hcryp.Init.GCMCMACPhase = CRYP_PAYLOAD_PHASE;
status = HAL_CRYPEx_AES_Auth(&hcryp, in, (blocks * AES_BLOCK_SIZE), out, if (blocks) {
STM32_HAL_TIMEOUT); status = HAL_CRYPEx_AES_Auth(&hcryp, (byte*)in,
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT);
}
} }
if (status == HAL_OK && partial != 0) { if (status == HAL_OK && partial != 0) {
/* GCM payload phase - partial remainder */ /* GCM payload phase - partial remainder */
@ -5408,9 +5410,11 @@ static int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in, word32 sz
} }
#else #else
HAL_CRYP_Init(&hcryp); HAL_CRYP_Init(&hcryp);
/* GCM payload phase - blocks */ if (blocks) {
status = HAL_CRYPEx_AESGCM_Encrypt(&hcryp, (byte*)in, /* GCM payload phase - blocks */
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT); status = HAL_CRYPEx_AESGCM_Encrypt(&hcryp, (byte*)in,
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT);
}
if (status == HAL_OK && partial != 0) { if (status == HAL_OK && partial != 0) {
/* GCM payload phase - partial remainder */ /* GCM payload phase - partial remainder */
XMEMSET(partialBlock, 0, sizeof(partialBlock)); XMEMSET(partialBlock, 0, sizeof(partialBlock));
@ -5718,7 +5722,7 @@ static int wc_AesGcmDecrypt_STM32(Aes* aes, byte* out,
word32 keyCopy[AES_256_KEY_SIZE/sizeof(word32)]; word32 keyCopy[AES_256_KEY_SIZE/sizeof(word32)];
#endif #endif
word32 keySize; word32 keySize;
int status; int status = HAL_OK;
word32 blocks = sz / AES_BLOCK_SIZE; word32 blocks = sz / AES_BLOCK_SIZE;
word32 partial = sz % AES_BLOCK_SIZE; word32 partial = sz % AES_BLOCK_SIZE;
byte tag[AES_BLOCK_SIZE]; byte tag[AES_BLOCK_SIZE];
@ -5785,8 +5789,10 @@ static int wc_AesGcmDecrypt_STM32(Aes* aes, byte* out,
if (status == HAL_OK) { if (status == HAL_OK) {
/* GCM payload phase - blocks */ /* GCM payload phase - blocks */
hcryp.Init.GCMCMACPhase = CRYP_PAYLOAD_PHASE; hcryp.Init.GCMCMACPhase = CRYP_PAYLOAD_PHASE;
status = HAL_CRYPEx_AES_Auth(&hcryp, in, (blocks * AES_BLOCK_SIZE), out, if (blocks) {
STM32_HAL_TIMEOUT); status = HAL_CRYPEx_AES_Auth(&hcryp, (byte*)in,
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT);
}
} }
if (status == HAL_OK && partial != 0) { if (status == HAL_OK && partial != 0) {
/* GCM payload phase - partial remainder */ /* GCM payload phase - partial remainder */
@ -5803,9 +5809,11 @@ static int wc_AesGcmDecrypt_STM32(Aes* aes, byte* out,
} }
#else #else
HAL_CRYP_Init(&hcryp); HAL_CRYP_Init(&hcryp);
/* GCM payload phase - blocks */ if (blocks) {
status = HAL_CRYPEx_AESGCM_Decrypt(&hcryp, (byte*)in, /* GCM payload phase - blocks */
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT); status = HAL_CRYPEx_AESGCM_Decrypt(&hcryp, (byte*)in,
(blocks * AES_BLOCK_SIZE), out, STM32_HAL_TIMEOUT);
}
if (status == HAL_OK && partial != 0) { if (status == HAL_OK && partial != 0) {
/* GCM payload phase - partial remainder */ /* GCM payload phase - partial remainder */
XMEMSET(partialBlock, 0, sizeof(partialBlock)); XMEMSET(partialBlock, 0, sizeof(partialBlock));