wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

FIPS Revalidation (acceptance fixes)

Browse Source 
1. Backed out some changes to AES-GCM with respect PIC32 only code. (This change will not be in the FIPS boundary.)
This commit is contained in:
John Safranek
2018-06-11 10:21:19 -07:00
parent df6fe0b07c
commit 10070bb5fd
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

@@ -8427,10 +8427,10 @@ int AES_GCM_encrypt_C(Aes* aes, byte* out, const byte* in, word32 sz,
#ifdef WOLFSSL_PIC32MZ_CRYPT #ifdef WOLFSSL_PIC32MZ_CRYPT
if (blocks) { if (blocks) {
/* use intitial IV for PIC32 HW, but don't use it below */ /* use intitial IV for PIC32 HW, but don't use it below */
XMEMCPY(aes->tmp, ctr, AES_BLOCK_SIZE); XMEMCPY(aes->reg, ctr, AES_BLOCK_SIZE);
ret = wc_Pic32AesCrypt( ret = wc_Pic32AesCrypt(
aes->key, aes->keylen, aes->tmp, AES_BLOCK_SIZE, aes->key, aes->keylen, aes->reg, AES_BLOCK_SIZE,
out, in, (blocks * AES_BLOCK_SIZE), out, in, (blocks * AES_BLOCK_SIZE),
PIC32_ENCRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_AES_GCM); PIC32_ENCRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_AES_GCM);
if (ret != 0) if (ret != 0)
@@ -8805,10 +8805,10 @@ int AES_GCM_decrypt_C(Aes* aes, byte* out, const byte* in, word32 sz,
#ifdef WOLFSSL_PIC32MZ_CRYPT #ifdef WOLFSSL_PIC32MZ_CRYPT
if (blocks) { if (blocks) {
/* use intitial IV for PIC32 HW, but don't use it below */ /* use intitial IV for PIC32 HW, but don't use it below */
XMEMCPY(aes->tmp, ctr, AES_BLOCK_SIZE); XMEMCPY(aes->reg, ctr, AES_BLOCK_SIZE);
ret = wc_Pic32AesCrypt( ret = wc_Pic32AesCrypt(
aes->key, aes->keylen, aes->tmp, AES_BLOCK_SIZE, aes->key, aes->keylen, aes->reg, AES_BLOCK_SIZE,
out, in, (blocks * AES_BLOCK_SIZE), out, in, (blocks * AES_BLOCK_SIZE),
PIC32_DECRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_AES_GCM); PIC32_DECRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_AES_GCM);
if (ret != 0) if (ret != 0)