From d8c66f5e092015a66504127c8073a604839f9e1b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 29 Jun 2017 15:03:14 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/3800) --- ssl/methods.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ssl') diff --git a/ssl/methods.c b/ssl/methods.c index f0926b7ce0..348efe467d 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, -- cgit v1.2.3