From: tb <tb@openbsd.org>
Date: Tue, 6 Feb 2018 02:40:29 +0000 (+0000)
Subject: Remove manual shutdown and close of the socket since in this case
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4a4ab3a6993aa0e492bbb47e470c5cdb7bb91ac6;p=openbsd

Remove manual shutdown and close of the socket since in this case
SSL_free will do this a second time.

ok jsing
---

diff --git a/usr.bin/openssl/s_time.c b/usr.bin/openssl/s_time.c
index 320380552b5..a533679776b 100644
--- a/usr.bin/openssl/s_time.c
+++ b/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.20 2018/01/07 08:43:26 inoguchi Exp $ */
+/* $OpenBSD: s_time.c,v 1.21 2018/02/06 02:40:29 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -353,8 +353,6 @@ s_time_main(int argc, char **argv)
 			    SSL_RECEIVED_SHUTDOWN);
 		else
 			SSL_shutdown(scon);
-		shutdown(SSL_get_fd(scon), SHUT_RDWR);
-		close(SSL_get_fd(scon));
 
 		nConn += 1;
 		if (SSL_session_reused(scon))
@@ -415,8 +413,6 @@ next:
 		    SSL_RECEIVED_SHUTDOWN);
 	else
 		SSL_shutdown(scon);
-	shutdown(SSL_get_fd(scon), SHUT_RDWR);
-	close(SSL_get_fd(scon));
 
 	nConn = 0;
 	totalTime = 0.0;
@@ -449,8 +445,6 @@ next:
 			    SSL_RECEIVED_SHUTDOWN);
 		else
 			SSL_shutdown(scon);
-		shutdown(SSL_get_fd(scon), SHUT_RDWR);
-		close(SSL_get_fd(scon));
 
 		nConn += 1;
 		if (SSL_session_reused(scon))