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

Merge pull request #584 from kaleb-himes/aes-gcm-bo

Browse Source 
sanity check on memcpy and xorbuf
This commit is contained in:
toddouska
2016-10-12 11:18:03 -07:00
committed by GitHub
parent 395972e6a8 05fcbb001a
commit 9cf4d7ca8e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/aes.c
View File

@@ -3864,6 +3864,10 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte *ctr ; byte *ctr ;
byte scratch[AES_BLOCK_SIZE]; byte scratch[AES_BLOCK_SIZE];
/* Sanity check for XMEMCPY in GHASH function and local xorbuf call */
if (authTagSz > AES_BLOCK_SIZE)
return BAD_FUNC_ARG;
#ifdef WOLFSSL_AESNI #ifdef WOLFSSL_AESNI
if (haveAESNI) { if (haveAESNI) {
AES_GCM_encrypt((void*)in, out, (void*)authIn, (void*)iv, authTag, AES_GCM_encrypt((void*)in, out, (void*)authIn, (void*)iv, authTag,
@@ -3935,6 +3939,10 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte *ctr ; byte *ctr ;
byte scratch[AES_BLOCK_SIZE]; byte scratch[AES_BLOCK_SIZE];
/* Sanity check for local ConstantCompare call */
if (authTagSz > AES_BLOCK_SIZE)
return BAD_FUNC_ARG;
#ifdef WOLFSSL_AESNI #ifdef WOLFSSL_AESNI
if (haveAESNI) { if (haveAESNI) {
if (AES_GCM_decrypt(in, out, authIn, iv, authTag, if (AES_GCM_decrypt(in, out, authIn, iv, authTag,