From d1b012a5aa610c2a77715ea628538867362a322a Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 18 Apr 2017 02:15:50 +0000
Subject: use freezero() instead of 4-line conditional explicit_bzero + free

---
 src/usr.bin/openssl/s_server.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/usr.bin/openssl/s_server.c')

diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index d73a11799b..493dc26264 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.25 2017/01/20 08:57:12 deraadt Exp $ */
+/* $OpenBSD: s_server.c,v 1.26 2017/04/18 02:15:50 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1590,10 +1590,7 @@ err:
 		SSL_free(con);
 	}
 	BIO_printf(bio_s_out, "CONNECTION CLOSED\n");
-	if (buf != NULL) {
-		explicit_bzero(buf, bufsize);
-		free(buf);
-	}
+	freezero(buf, bufsize);
 	if (ret >= 0)
 		BIO_printf(bio_s_out, "ACCEPT\n");
 	return (ret);
-- 
cgit v1.2.3-55-g6feb