diff options
| author |   tb <tb@openbsd.org> | 2018-02-06 02:40:29 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-02-06 02:40:29 +0000 |
| commit | 4a4ab3a6993aa0e492bbb47e470c5cdb7bb91ac6 (patch) | |
| tree | 15c7cb5d3650570c668a5b7642a1bb37588717ba | |
| parent | Respect the OPENSSL make variable everywhere so that (diff) | |
| download | wireguard-openbsd-4a4ab3a6993aa0e492bbb47e470c5cdb7bb91ac6.tar.xz wireguard-openbsd-4a4ab3a6993aa0e492bbb47e470c5cdb7bb91ac6.zip | |
Remove manual shutdown and close of the socket since in this case
SSL_free will do this a second time.
ok jsing
| -rw-r--r-- | usr.bin/openssl/s_time.c | 8 |
1 files changed, 1 insertions, 7 deletions
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)) |