diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_methods.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c index 084f533f5e..a3e51ac0d0 100644 --- a/src/lib/libssl/ssl_methods.c +++ b/src/lib/libssl/ssl_methods.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_methods.c,v 1.23 2021/02/25 17:06:05 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_methods.c,v 1.24 2021/03/31 16:59:32 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -59,7 +59,6 @@ | |||
59 | #include "ssl_locl.h" | 59 | #include "ssl_locl.h" |
60 | #include "tls13_internal.h" | 60 | #include "tls13_internal.h" |
61 | 61 | ||
62 | #ifdef LIBRESSL_HAS_DTLS1_2 | ||
63 | static const SSL_METHOD_INTERNAL DTLS_method_internal_data = { | 62 | static const SSL_METHOD_INTERNAL DTLS_method_internal_data = { |
64 | .dtls = 1, | 63 | .dtls = 1, |
65 | .server = 1, | 64 | .server = 1, |
@@ -117,7 +116,6 @@ static const SSL_METHOD DTLS_client_method_data = { | |||
117 | .put_cipher_by_char = ssl3_put_cipher_by_char, | 116 | .put_cipher_by_char = ssl3_put_cipher_by_char, |
118 | .internal = &DTLS_client_method_internal_data, | 117 | .internal = &DTLS_client_method_internal_data, |
119 | }; | 118 | }; |
120 | #endif | ||
121 | 119 | ||
122 | static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { | 120 | static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { |
123 | .dtls = 1, | 121 | .dtls = 1, |
@@ -274,31 +272,19 @@ DTLSv1_2_server_method(void) | |||
274 | const SSL_METHOD * | 272 | const SSL_METHOD * |
275 | DTLS_client_method(void) | 273 | DTLS_client_method(void) |
276 | { | 274 | { |
277 | #ifdef LIBRESSL_HAS_DTLS1_2 | ||
278 | return &DTLS_client_method_data; | 275 | return &DTLS_client_method_data; |
279 | #else | ||
280 | return DTLSv1_client_method(); | ||
281 | #endif | ||
282 | } | 276 | } |
283 | 277 | ||
284 | const SSL_METHOD * | 278 | const SSL_METHOD * |
285 | DTLS_method(void) | 279 | DTLS_method(void) |
286 | { | 280 | { |
287 | #ifdef LIBRESSL_HAS_DTLS1_2 | ||
288 | return &DTLS_method_data; | 281 | return &DTLS_method_data; |
289 | #else | ||
290 | return DTLSv1_method(); | ||
291 | #endif | ||
292 | } | 282 | } |
293 | 283 | ||
294 | const SSL_METHOD * | 284 | const SSL_METHOD * |
295 | DTLS_server_method(void) | 285 | DTLS_server_method(void) |
296 | { | 286 | { |
297 | #ifdef LIBRESSL_HAS_DTLS1_2 | ||
298 | return &DTLS_method_data; | 287 | return &DTLS_method_data; |
299 | #else | ||
300 | return DTLSv1_server_method(); | ||
301 | #endif | ||
302 | } | 288 | } |
303 | 289 | ||
304 | #if defined(LIBRESSL_HAS_TLS1_3_CLIENT) && defined(LIBRESSL_HAS_TLS1_3_SERVER) | 290 | #if defined(LIBRESSL_HAS_TLS1_3_CLIENT) && defined(LIBRESSL_HAS_TLS1_3_SERVER) |