From 92f4e2ce0c9ddc92f921c99c2ca499dd86451dd4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 12 Sep 2015 12:17:00 +0000
Subject: Use explicit_bzero() instead of memset() when clearing private keys.

ok bcook@ beck@ miod@
---
 src/lib/libssl/s3_clnt.c         | 7 ++++---
 src/lib/libssl/src/ssl/s3_clnt.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index c2da428955..12677319cc 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.129 2015/09/12 10:25:38 jsing Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.130 2015/09/12 12:17:00 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1978,7 +1978,7 @@ ssl3_send_client_key_exchange(SSL *s)
 				s->session->master_key, p, n);
 
 			/* Clean up. */
-			memset(p, 0, n);
+			explicit_bzero(p, n);
 
 			/* Send off the data. */
 			n = BN_num_bytes(dh_clnt->pub_key);
@@ -2071,7 +2071,8 @@ ssl3_send_client_key_exchange(SSL *s)
 			    s->method->ssl3_enc->generate_master_secret(s,
 				s->session->master_key, p, n);
 
-			memset(p, 0, n); /* clean up */
+			/* Clean up. */
+			explicit_bzero(p, n);
 
 			/*
 			 * First check the size of encoding and
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index c2da428955..12677319cc 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.129 2015/09/12 10:25:38 jsing Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.130 2015/09/12 12:17:00 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1978,7 +1978,7 @@ ssl3_send_client_key_exchange(SSL *s)
 				s->session->master_key, p, n);
 
 			/* Clean up. */
-			memset(p, 0, n);
+			explicit_bzero(p, n);
 
 			/* Send off the data. */
 			n = BN_num_bytes(dh_clnt->pub_key);
@@ -2071,7 +2071,8 @@ ssl3_send_client_key_exchange(SSL *s)
 			    s->method->ssl3_enc->generate_master_secret(s,
 				s->session->master_key, p, n);
 
-			memset(p, 0, n); /* clean up */
+			/* Clean up. */
+			explicit_bzero(p, n);
 
 			/*
 			 * First check the size of encoding and
-- 
cgit v1.2.3-55-g6feb