[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  39176d44248ed5581ecd1e05bb9385e28a3d803b (commit)
      from  45615c5fac0aba7bd41be270c4bcf194bf1049f4 (commit)


- Log -----------------------------------------------------------------
commit 39176d44248ed5581ecd1e05bb9385e28a3d803b
Author: Peter Wu <peter at lekensteyn.nl>
Date:   Fri Mar 17 19:17:57 2017 +0100

    doc: fix -keylogfile option
    
    Add it in the options section, not the "Connected commands" section.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2977)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/s_server.pod | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index c16b562..b34dadd 100644
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -529,6 +529,11 @@ The list should contain most wanted protocols first.
 Protocol names are printable ASCII strings, for example "http/1.1" or
 "spdy/3".
 
+=item B<-keylogfile path>
+
+Appends TLS secrets to the specified keylog file such that external programs
+(like Wireshark) can decrypt TLS connections.
+
 =item B<-max_early_data arg>
 
 Change the default maximum early data bytes that are specified for new sessions
@@ -578,11 +583,6 @@ cause the client to disconnect due to a protocol violation.
 
 print out some session cache status information.
 
-=item B<-keylogfile path>
-
-Appends TLS secrets to the specified keylog file such that external programs
-(like Wireshark) can decrypt TLS connections.
-
 =back
 
 =head1 NOTES