[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  845645327dd4b12b6c26c0814502d79740f84028 (commit)
      from  e1d2ea3a54527996e9425de807143b061206e0ab (commit)


- Log -----------------------------------------------------------------
commit 845645327dd4b12b6c26c0814502d79740f84028
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Fri Mar 31 20:48:28 2017 +0200

    Don't mention TLS 1.3 in the man page
    
    The man pages for ciphers, s_client and s_server mention the tls1_3
    option but it is not implemented in the 1.1.0 branch. Thus remove it to
    avoid confusion.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3099)

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

Summary of changes:
 doc/apps/ciphers.pod  | 6 ------
 doc/apps/s_client.pod | 4 +---
 doc/apps/s_server.pod | 4 +---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index e0ab291..03cac2f 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -15,7 +15,6 @@ B<openssl> B<ciphers>
 [B<-tls1>]
 [B<-tls1_1>]
 [B<-tls1_2>]
-[B<-tls1_3>]
 [B<-s>]
 [B<-psk>]
 [B<-srp>]
@@ -70,11 +69,6 @@ L<SSL_CIPHER_description(3)>.
 
 Like B<-v>, but include the official cipher suite values in hex.
 
-=item B<-tls1_3>
-
-In combination with the B<-s> option, list the ciphers which would be used if
-TLSv1.3 were negotiated.
-
 =item B<-tls1_2>
 
 In combination with the B<-s> option, list the ciphers which would be used if
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 764a63d..43989d0 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -71,12 +71,10 @@ B<openssl> B<s_client>
 [B<-tls1>]
 [B<-tls1_1>]
 [B<-tls1_2>]
-[B<-tls1_3>]
 [B<-no_ssl3>]
 [B<-no_tls1>]
 [B<-no_tls1_1>]
 [B<-no_tls1_2>]
-[B<-no_tls1_3>]
 [B<-dtls>]
 [B<-dtls1>]
 [B<-dtls1_2>]
@@ -355,7 +353,7 @@ Use the PSK key B<key> when using a PSK cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example -psk
 1a2b3c4d.
 
-=item B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-tls1_3>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>, B<-no_tls1_3>
+=item B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>
 
 These options require or disable the use of the specified SSL or TLS protocols.
 By default B<s_client> will negotiate the highest mutually supported protocol
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 6aaefe4..ad71867 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -78,7 +78,6 @@ B<openssl> B<s_server>
 [B<-tls1>]
 [B<-tls1_1>]
 [B<-tls1_2>]
-[B<-tls1_3>]
 [B<-dtls>]
 [B<-dtls1>]
 [B<-dtls1_2>]
@@ -91,7 +90,6 @@ B<openssl> B<s_server>
 [B<-no_tls1>]
 [B<-no_tls1_1>]
 [B<-no_tls1_2>]
-[B<-no_tls1_3>]
 [B<-no_dhe>]
 [B<-bugs>]
 [B<-comp>]
@@ -326,7 +324,7 @@ Use the PSK key B<key> when using a PSK cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example -psk
 1a2b3c4d.
 
-=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-tls1_3>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>, B<-no_tls1_3>
+=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>
 
 These options require or disable the use of the specified SSL or TLS protocols.
 By default B<s_server> will negotiate the highest mutually supported protocol