From bfe4819cb54b7d030c3dde3dd28c77ecd04e7f46 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 9 Jul 2014 16:51:09 +0000
Subject: Replace memset(a, 0, ...); free(a); by explicit_bzero(a, ...);
 free(a); in fear a smartass-optimizing compiler decides memset is useless
 immediately before free().

ok jsing@ deraadt@ tedu@
---
 src/lib/libcrypto/buffer/buffer.c         | 4 ++--
 src/lib/libssl/src/crypto/buffer/buffer.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
index 8dbddd0889..3373e324ae 100644
--- a/src/lib/libcrypto/buffer/buffer.c
+++ b/src/lib/libcrypto/buffer/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: buffer.c,v 1.19 2014/07/09 16:51:09 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a)
 		return;
 
 	if (a->data != NULL) {
-		memset(a->data, 0, a->max);
+		explicit_bzero(a->data, a->max);
 		free(a->data);
 	}
 	free(a);
diff --git a/src/lib/libssl/src/crypto/buffer/buffer.c b/src/lib/libssl/src/crypto/buffer/buffer.c
index 8dbddd0889..3373e324ae 100644
--- a/src/lib/libssl/src/crypto/buffer/buffer.c
+++ b/src/lib/libssl/src/crypto/buffer/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: buffer.c,v 1.19 2014/07/09 16:51:09 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a)
 		return;
 
 	if (a->data != NULL) {
-		memset(a->data, 0, a->max);
+		explicit_bzero(a->data, a->max);
 		free(a->data);
 	}
 	free(a);
-- 
cgit v1.2.3-55-g6feb