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_client.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/usr.bin/openssl/s_client.c') diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index 4a0a832c12..aa1c5764bd 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.31 2017/01/24 09:07:40 jsing Exp $ */ +/* $OpenBSD: s_client.c,v 1.32 2017/04/18 02:15:50 deraadt Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1266,18 +1266,9 @@ end: free(pass); if (vpm) X509_VERIFY_PARAM_free(vpm); - if (cbuf != NULL) { - explicit_bzero(cbuf, BUFSIZZ); - free(cbuf); - } - if (sbuf != NULL) { - explicit_bzero(sbuf, BUFSIZZ); - free(sbuf); - } - if (mbuf != NULL) { - explicit_bzero(mbuf, BUFSIZZ); - free(mbuf); - } + freezero(cbuf, BUFSIZZ); + freezero(sbuf, BUFSIZZ); + freezero(mbuf, BUFSIZZ); if (bio_c_out != NULL) { BIO_free(bio_c_out); bio_c_out = NULL; -- cgit v1.2.3-55-g6feb