summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_server.c
diff options
context:
space:
mode:
authorderaadt <>2017-04-18 02:15:50 +0000
committerderaadt <>2017-04-18 02:15:50 +0000
commitd1b012a5aa610c2a77715ea628538867362a322a (patch)
tree94592c42f2d7070c569ac2d452a15695d8551ab8 /src/usr.bin/openssl/s_server.c
parent0cb12ace14f001cd3e42cd8bfffe9903ffc74412 (diff)
downloadopenbsd-d1b012a5aa610c2a77715ea628538867362a322a.tar.gz
openbsd-d1b012a5aa610c2a77715ea628538867362a322a.tar.bz2
openbsd-d1b012a5aa610c2a77715ea628538867362a322a.zip
use freezero() instead of 4-line conditional explicit_bzero + free
Diffstat (limited to 'src/usr.bin/openssl/s_server.c')
-rw-r--r--src/usr.bin/openssl/s_server.c7
1 files changed, 2 insertions, 5 deletions
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 @@
1/* $OpenBSD: s_server.c,v 1.25 2017/01/20 08:57:12 deraadt Exp $ */ 1/* $OpenBSD: s_server.c,v 1.26 2017/04/18 02:15:50 deraadt Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1590,10 +1590,7 @@ err:
1590 SSL_free(con); 1590 SSL_free(con);
1591 } 1591 }
1592 BIO_printf(bio_s_out, "CONNECTION CLOSED\n"); 1592 BIO_printf(bio_s_out, "CONNECTION CLOSED\n");
1593 if (buf != NULL) { 1593 freezero(buf, bufsize);
1594 explicit_bzero(buf, bufsize);
1595 free(buf);
1596 }
1597 if (ret >= 0) 1594 if (ret >= 0)
1598 BIO_printf(bio_s_out, "ACCEPT\n"); 1595 BIO_printf(bio_s_out, "ACCEPT\n");
1599 return (ret); 1596 return (ret);