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

Merge pull request #1650 from dgarske/fix_armv8_aes

Browse Source 
Fix ARMv8 AES code build error
This commit is contained in:
toddouska
2018-07-02 16:23:32 -07:00
committed by GitHub
parent 77f11a6be9 44c4e33290
commit fbd5a4f67f
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wolfcrypt/src/port/arm/armv8-aes.c
View File

@ -110,10 +110,6 @@ static const byte rcon[] = {
#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
enum {
NONCE_SZ = 12,
CTR_SZ = 4
};
static WC_INLINE void IncrementGcmCounter(byte* inOutCtr) static WC_INLINE void IncrementGcmCounter(byte* inOutCtr)
{ {
@ -1555,7 +1551,7 @@ static int Aes128GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte* keyPt; /* pointer to handle pointer advencment */ byte* keyPt; /* pointer to handle pointer advencment */
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }
@ -1873,7 +1869,7 @@ static int Aes192GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte* keyPt; /* pointer to handle pointer advencment */ byte* keyPt; /* pointer to handle pointer advencment */
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }
@ -2206,7 +2202,7 @@ static int Aes256GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte* keyPt; /* pointer to handle pointer advencment */ byte* keyPt; /* pointer to handle pointer advencment */
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }
@ -2631,7 +2627,7 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
} }
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }
@ -4233,7 +4229,7 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
} }
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }
@ -4312,7 +4308,7 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
} }
XMEMSET(initialCounter, 0, AES_BLOCK_SIZE); XMEMSET(initialCounter, 0, AES_BLOCK_SIZE);
if (ivSz == NONCE_SZ) { if (ivSz == GCM_NONCE_MID_SZ) {
XMEMCPY(initialCounter, iv, ivSz); XMEMCPY(initialCounter, iv, ivSz);
initialCounter[AES_BLOCK_SIZE - 1] = 1; initialCounter[AES_BLOCK_SIZE - 1] = 1;
} }