[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d8c66f5e092015a66504127c8073a604839f9e1b (commit)
      from  2915fe19a6676374c335d8c50eaaa4c940cf47d6 (commit)


- Log -----------------------------------------------------------------
commit d8c66f5e092015a66504127c8073a604839f9e1b
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 29 15:03:14 2017 +0100

    Drop support for OPENSSL_NO_TLS1_3_METHOD
    
    There are no public TLSv1_3_*method() functions so
    OPENSSL_NO_TLS1_3_METHOD doesn't make any sense and should be removed.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3800)

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

Summary of changes:
 Configure     | 2 +-
 ssl/methods.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Configure b/Configure
index e302a58..ce3d6da 100755
--- a/Configure
+++ b/Configure
@@ -416,7 +416,7 @@ my @disablables = (
 foreach my $proto ((@tls, @dtls))
 	{
 	push(@disablables, $proto);
-	push(@disablables, "$proto-method");
+	push(@disablables, "$proto-method") unless $proto eq "tls1_3";
 	}
 
 my %deprecated_disablables = (
diff --git a/ssl/methods.c b/ssl/methods.c
index f0926b7..348efe4 100644
--- a/ssl/methods.c
+++ b/ssl/methods.c
@@ -19,12 +19,10 @@ IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_method,
                         ossl_statem_accept,
                         ossl_statem_connect, TLSv1_2_enc_data)
-#ifndef OPENSSL_NO_TLS1_3_METHOD
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
                         tlsv1_3_method,
                         ossl_statem_accept,
                         ossl_statem_connect, TLSv1_3_enc_data)
-#endif
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_method,
@@ -52,12 +50,10 @@ IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_server_method,
                         ossl_statem_accept,
                         ssl_undefined_function, TLSv1_2_enc_data)
-#ifndef OPENSSL_NO_TLS1_3_METHOD
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
                         tlsv1_3_server_method,
                         ossl_statem_accept,
                         ssl_undefined_function, TLSv1_3_enc_data)
-#endif
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_server_method,
@@ -87,12 +83,10 @@ IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
                         TLS_client_method,
                         ssl_undefined_function,
                         ossl_statem_connect, TLSv1_2_enc_data)
-#ifndef OPENSSL_NO_TLS1_3_METHOD
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
                         tlsv1_3_client_method,
                         ssl_undefined_function,
                         ossl_statem_connect, TLSv1_3_enc_data)
-#endif
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
                         tlsv1_2_client_method,