Force-zero output buffer for AES-SIV decrypt for other AES errors as well

holtrop-wolfssl · holtrop-wolfssl · commit 7064eeca8907 · 2026-06-12T12:19:06.000-04:00
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
@@ -17098,10 +17098,10 @@ static WARN_UNUSED_RESULT int AesSivCipher(
                 WOLFSSL_MSG("Computed SIV doesn't match received SIV.");
                 ret = AES_SIV_AUTH_E;
             }
+        }
 
-            if (ret != 0) {
-                ForceZero(out, dataSz);
-            }
+        if (ret != 0) {
+            ForceZero(out, dataSz);
         }
 
     #ifdef WOLFSSL_SMALL_STACK

Original file line number	Diff line number	Diff line change
`@@ -17098,10 +17098,10 @@ static WARN_UNUSED_RESULT int AesSivCipher(`
`17098`	`17098`	`WOLFSSL_MSG("Computed SIV doesn't match received SIV.");`
`17099`	`17099`	`ret = AES_SIV_AUTH_E;`
`17100`	`17100`	`}`
	`17101`	`+ }`
`17101`	`17102`
`17102`		`- if (ret != 0) {`
`17103`		`- ForceZero(out, dataSz);`
`17104`		`- }`
	`17103`	`+ if (ret != 0) {`
	`17104`	`+ ForceZero(out, dataSz);`
`17105`	`17105`	`}`
`17106`	`17106`
`17107`	`17107`	`#ifdef WOLFSSL_SMALL_STACK`