diff options
author | tb <> | 2018-02-06 02:40:29 +0000 |
---|---|---|
committer | tb <> | 2018-02-06 02:40:29 +0000 |
commit | 881f617541ac034d6c3fd7977456c4a3418f9786 (patch) | |
tree | ad423330616fbf06d863f162dd6e686c09629a15 /src | |
parent | 62b0484ba95148b34b734bb8b8136f4a9fb2b354 (diff) | |
download | openbsd-881f617541ac034d6c3fd7977456c4a3418f9786.tar.gz openbsd-881f617541ac034d6c3fd7977456c4a3418f9786.tar.bz2 openbsd-881f617541ac034d6c3fd7977456c4a3418f9786.zip |
Remove manual shutdown and close of the socket since in this case
SSL_free will do this a second time.
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/s_time.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c index 320380552b..a533679776 100644 --- a/src/usr.bin/openssl/s_time.c +++ b/src/usr.bin/openssl/s_time.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_time.c,v 1.20 2018/01/07 08:43:26 inoguchi Exp $ */ | 1 | /* $OpenBSD: s_time.c,v 1.21 2018/02/06 02:40:29 tb 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 | * |
@@ -353,8 +353,6 @@ s_time_main(int argc, char **argv) | |||
353 | SSL_RECEIVED_SHUTDOWN); | 353 | SSL_RECEIVED_SHUTDOWN); |
354 | else | 354 | else |
355 | SSL_shutdown(scon); | 355 | SSL_shutdown(scon); |
356 | shutdown(SSL_get_fd(scon), SHUT_RDWR); | ||
357 | close(SSL_get_fd(scon)); | ||
358 | 356 | ||
359 | nConn += 1; | 357 | nConn += 1; |
360 | if (SSL_session_reused(scon)) | 358 | if (SSL_session_reused(scon)) |
@@ -415,8 +413,6 @@ next: | |||
415 | SSL_RECEIVED_SHUTDOWN); | 413 | SSL_RECEIVED_SHUTDOWN); |
416 | else | 414 | else |
417 | SSL_shutdown(scon); | 415 | SSL_shutdown(scon); |
418 | shutdown(SSL_get_fd(scon), SHUT_RDWR); | ||
419 | close(SSL_get_fd(scon)); | ||
420 | 416 | ||
421 | nConn = 0; | 417 | nConn = 0; |
422 | totalTime = 0.0; | 418 | totalTime = 0.0; |
@@ -449,8 +445,6 @@ next: | |||
449 | SSL_RECEIVED_SHUTDOWN); | 445 | SSL_RECEIVED_SHUTDOWN); |
450 | else | 446 | else |
451 | SSL_shutdown(scon); | 447 | SSL_shutdown(scon); |
452 | shutdown(SSL_get_fd(scon), SHUT_RDWR); | ||
453 | close(SSL_get_fd(scon)); | ||
454 | 448 | ||
455 | nConn += 1; | 449 | nConn += 1; |
456 | if (SSL_session_reused(scon)) | 450 | if (SSL_session_reused(scon)) |