Merge pull request #2479 from tmael/aes_gcm

Initialize AES GCM set key
2019-09-20 14:34:25 -07:00
parent b92509144b 74386fd0d0
commit bcd8a521f5
1 changed files with 6 additions and 0 deletions
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@ -3601,6 +3601,12 @@ int wc_AesGcmSetKey(Aes* aes, const byte* key, word32 len)
    if (!((len == 16) || (len == 24) || (len == 32)))
        return BAD_FUNC_ARG;

+#ifdef OPENSSL_EXTRA
+    if (aes != NULL) {
+        XMEMSET(aes->aadH, 0, sizeof(aes->aadH));
+        aes->aadLen = 0;
+    }
+#endif
    XMEMSET(iv, 0, AES_BLOCK_SIZE);
    ret = wc_AesSetKey(aes, key, len, iv, AES_ENCRYPTION);