Merge pull request #6416 from embhorn/gh6413

JacobBarthelmeh · web-flow · commit 2bb3ade4acb6 · 2023-05-17T13:46:49.000-06:00
Fix valgrind issue with memcpy
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
@@ -8410,7 +8410,7 @@ int wc_AesGcmInit(Aes* aes, const byte* key, word32 len, const byte* iv,
     if (ret == 0) {
         /* Set the IV passed in if it is smaller than a block. */
         if ((iv != NULL) && (ivSz <= AES_BLOCK_SIZE)) {
-            XMEMCPY((byte*)aes->reg, iv, ivSz);
+            XMEMMOVE((byte*)aes->reg, iv, ivSz);
             aes->nonceSz = ivSz;
         }
         /* No IV passed in, check for cached IV. */

Original file line number	Diff line number	Diff line change
`@@ -8410,7 +8410,7 @@ int wc_AesGcmInit(Aes* aes, const byte* key, word32 len, const byte* iv,`
`8410`	`8410`	`if (ret == 0) {`
`8411`	`8411`	`/* Set the IV passed in if it is smaller than a block. */`
`8412`	`8412`	`if ((iv != NULL) && (ivSz <= AES_BLOCK_SIZE)) {`
`8413`		`- XMEMCPY((byte*)aes->reg, iv, ivSz);`
	`8413`	`+ XMEMMOVE((byte*)aes->reg, iv, ivSz);`
`8414`	`8414`	`aes->nonceSz = ivSz;`
`8415`	`8415`	`}`
`8416`	`8416`	`/* No IV passed in, check for cached IV. */`