From b60dba4db81ebcfa3cf3baf5cbf993ef15ac7c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerardo=20Ravago=20=F0=9F=87=B5=F0=9F=87=AD?=
 <gcr@amazon.com>
Date: Fri, 29 Dec 2023 13:36:00 -0500
Subject: [PATCH] zero out memory on init

---
 crypto/fipsmodule/cipher/e_aesccm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/fipsmodule/cipher/e_aesccm.c b/crypto/fipsmodule/cipher/e_aesccm.c
index ce5f18a5a4d..33e765c16cf 100644
--- a/crypto/fipsmodule/cipher/e_aesccm.c
+++ b/crypto/fipsmodule/cipher/e_aesccm.c
@@ -623,6 +623,7 @@ static int cipher_aes_ccm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
   CIPHER_AES_CCM_CTX *cipher_ctx = CCM_CTX(ctx);
   switch (type) {
     case EVP_CTRL_INIT:
+      OPENSSL_memset(cipher_ctx, 0, sizeof(CIPHER_AES_CCM_CTX));
       cipher_ctx->key_set = 0;
       cipher_ctx->iv_set = 0;
       cipher_ctx->tag_set = 0;