]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Remove compile guards for dtls1.3 method implementations
authorFrederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Wed, 4 Oct 2023 07:41:14 +0000 (09:41 +0200)
committerTomas Mraz <tomas@openssl.org>
Thu, 9 Jan 2025 15:57:23 +0000 (16:57 +0100)
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22259)

ssl/methods.c

index 836d859ec73bcca3198bf4689505d474be53f736..5dd29fbbb29fececbc75424a2cc6b3ba9ebdac6b 100644 (file)
@@ -125,12 +125,10 @@ IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           ossl_statem_accept,
                           ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
-#ifndef OPENSSL_NO_DTLS1_3_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_3_VERSION, 0, SSL_OP_NO_DTLSv1_3,
                           dtlsv1_3_method,
                           ossl_statem_accept,
                           ossl_statem_connect, DTLSv1_3_enc_data)
-#endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_method,
                           ossl_statem_accept,
@@ -151,12 +149,10 @@ IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           ossl_statem_accept,
                           ssl_undefined_function, DTLSv1_2_enc_data)
 #endif
-#ifndef OPENSSL_NO_DTLS1_3_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_3_VERSION, 0, SSL_OP_NO_DTLSv1_3,
                           dtlsv1_3_server_method,
                           ossl_statem_accept,
                           ssl_undefined_function, DTLSv1_3_enc_data)
-#endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_server_method,
                           ossl_statem_accept,
@@ -181,12 +177,10 @@ IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
                           ssl_undefined_function,
                           ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
-#ifndef OPENSSL_NO_DTLS1_3_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_3_VERSION, 0, SSL_OP_NO_DTLSv1_3,
                           dtlsv1_3_client_method,
                           ssl_undefined_function,
                           ossl_statem_connect, DTLSv1_3_enc_data)
-#endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
                           DTLS_client_method,
                           ssl_undefined_function,