Change the default behavior of the s_time command so that it will

perform a proper shutdown by sending a "close notify" alert to the
server.  This allows s_time to benchmark a full TLS connection
more accurately.

Introduce a new flag called -no_shutdown to make s_time adopt the
previous behavior (i.e. shut down the connection without notifying the
server) so that comparisons can still be made with OpenSSL's version.

The idea of using a flag (which replaces a #define) was suggested by
bcook@.  Thanks to millert@ and miod@ as well for their feedback on an
earlier diff which resulted in this change.

ok bcook@ beck@

1 files changed, 7 insertions, 2 deletions

diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index ea6f9fcbb0..23006b70c6 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.19 2015/08/11 05:01:03 landry Exp $
+.\" $OpenBSD: openssl.1,v 1.20 2015/09/11 02:10:32 lteo Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: August 11 2015 $
+.Dd $Mdocdate: September 11 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -7074,6 +7074,7 @@ unknown cipher suites a client says it supports.
 .Op Fl key Ar keyfile
 .Op Fl nbio
 .Op Fl new
+.Op Fl no_shutdown
 .Op Fl reuse
 .Op Fl time Ar seconds
 .Op Fl verify Ar depth
@@ -7135,6 +7136,10 @@ nor
 .Fl reuse
 are specified,
 they are both on by default and executed in sequence.
+.It Fl no_shutdown
+Shutdown the connection without sending a
+.Dq close notify
+shutdown alert to the server.
 .It Fl reuse
 Performs the timing test using the same session ID;
 this can be used as a test that session caching is working.