Merge pull request #8107 from JacobBarthelmeh/aesgcm

douzzer · web-flow · commit 82273094e0ee · 2024-10-23T16:52:42.000-05:00
fix for state of aes.gcm.H on re-use
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
@@ -8063,6 +8063,8 @@ static void GHASH_FINAL(Aes* aes, byte* s, word32 sSz)
     GHASH_LEN_BLOCK(aes);
     /* Copy the result into s. */
     XMEMCPY(s, AES_TAG(aes), sSz);
+    /* reset aes->gcm.H in case of re-use */
+    GHASH_INIT_EXTRA(aes);
 }
 #endif /* WOLFSSL_AESGCM_STREAM */
 

Original file line number	Diff line number	Diff line change
`@@ -8063,6 +8063,8 @@ static void GHASH_FINAL(Aes* aes, byte* s, word32 sSz)`
`8063`	`8063`	`GHASH_LEN_BLOCK(aes);`
`8064`	`8064`	`/* Copy the result into s. */`
`8065`	`8065`	`XMEMCPY(s, AES_TAG(aes), sSz);`
	`8066`	`+ /* reset aes->gcm.H in case of re-use */`
	`8067`	`+ GHASH_INIT_EXTRA(aes);`
`8066`	`8068`	`}`
`8067`	`8069`	`#endif /* WOLFSSL_AESGCM_STREAM */`
`8068`	`8070`