From c14b20da98a1466c75cb26dd7c3ed81e98cd1343 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 15 Jun 2014 15:41:25 +0000
Subject: Add missing OPENSSL_cleanse() in aead_aes_gcm_cleanup().

ok beck@ miod@
---
 src/lib/libcrypto/evp/e_aes.c         | 3 ++-
 src/lib/libssl/src/crypto/evp/e_aes.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 07b3469f42..8ee93c4bbd 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes.c,v 1.20 2014/06/15 15:39:43 jsing Exp $ */
+/* $OpenBSD: e_aes.c,v 1.21 2014/06/15 15:41:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -1323,6 +1323,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx)
 {
 	struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
 
+	OPENSSL_cleanse(gcm_ctx, sizeof(*gcm_ctx));
 	free(gcm_ctx);
 }
 
diff --git a/src/lib/libssl/src/crypto/evp/e_aes.c b/src/lib/libssl/src/crypto/evp/e_aes.c
index 07b3469f42..8ee93c4bbd 100644
--- a/src/lib/libssl/src/crypto/evp/e_aes.c
+++ b/src/lib/libssl/src/crypto/evp/e_aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes.c,v 1.20 2014/06/15 15:39:43 jsing Exp $ */
+/* $OpenBSD: e_aes.c,v 1.21 2014/06/15 15:41:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -1323,6 +1323,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx)
 {
 	struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
 
+	OPENSSL_cleanse(gcm_ctx, sizeof(*gcm_ctx));
 	free(gcm_ctx);
 }
 
-- 
cgit v1.2.3-55-g6feb