diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 5665a09179..5ed2198b38 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.185 2021/03/31 16:55:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.186 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 | * |
@@ -301,9 +301,7 @@ extern "C" { | |||
301 | #define SSL_TXT_STREEBOG512 "STREEBOG512" | 301 | #define SSL_TXT_STREEBOG512 "STREEBOG512" |
302 | 302 | ||
303 | #define SSL_TXT_DTLS1 "DTLSv1" | 303 | #define SSL_TXT_DTLS1 "DTLSv1" |
304 | #if defined(LIBRESSL_HAS_DTLS1_2) || defined(LIBRESSL_INTERNAL) | ||
305 | #define SSL_TXT_DTLS1_2 "DTLSv1.2" | 304 | #define SSL_TXT_DTLS1_2 "DTLSv1.2" |
306 | #endif | ||
307 | #define SSL_TXT_SSLV2 "SSLv2" | 305 | #define SSL_TXT_SSLV2 "SSLv2" |
308 | #define SSL_TXT_SSLV3 "SSLv3" | 306 | #define SSL_TXT_SSLV3 "SSLv3" |
309 | #define SSL_TXT_TLSV1 "TLSv1" | 307 | #define SSL_TXT_TLSV1 "TLSv1" |
@@ -523,10 +521,8 @@ struct ssl_session_st { | |||
523 | #define SSL_OP_NO_TLSv1_3 0x20000000L | 521 | #define SSL_OP_NO_TLSv1_3 0x20000000L |
524 | #endif | 522 | #endif |
525 | 523 | ||
526 | #if defined(LIBRESSL_HAS_DTLS1_2) || defined(LIBRESSL_INTERNAL) | ||
527 | #define SSL_OP_NO_DTLSv1 0x40000000L | 524 | #define SSL_OP_NO_DTLSv1 0x40000000L |
528 | #define SSL_OP_NO_DTLSv1_2 0x80000000L | 525 | #define SSL_OP_NO_DTLSv1_2 0x80000000L |
529 | #endif | ||
530 | 526 | ||
531 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ | 527 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ |
532 | #define SSL_OP_ALL \ | 528 | #define SSL_OP_ALL \ |
@@ -1465,9 +1461,7 @@ void SSL_free(SSL *ssl); | |||
1465 | int SSL_up_ref(SSL *ssl); | 1461 | int SSL_up_ref(SSL *ssl); |
1466 | int SSL_accept(SSL *ssl); | 1462 | int SSL_accept(SSL *ssl); |
1467 | int SSL_connect(SSL *ssl); | 1463 | int SSL_connect(SSL *ssl); |
1468 | #ifdef LIBRESSL_INTERNAL | ||
1469 | int SSL_is_dtls(const SSL *s); | 1464 | int SSL_is_dtls(const SSL *s); |
1470 | #endif | ||
1471 | int SSL_is_server(const SSL *s); | 1465 | int SSL_is_server(const SSL *s); |
1472 | int SSL_read(SSL *ssl, void *buf, int num); | 1466 | int SSL_read(SSL *ssl, void *buf, int num); |
1473 | int SSL_peek(SSL *ssl, void *buf, int num); | 1467 | int SSL_peek(SSL *ssl, void *buf, int num); |
@@ -1527,11 +1521,9 @@ const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */ | |||
1527 | const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */ | 1521 | const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */ |
1528 | const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */ | 1522 | const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */ |
1529 | 1523 | ||
1530 | #if defined(LIBRESSL_HAS_DTLS1_2) || defined(LIBRESSL_INTERNAL) | ||
1531 | const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */ | 1524 | const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */ |
1532 | const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */ | 1525 | const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */ |
1533 | const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */ | 1526 | const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */ |
1534 | #endif | ||
1535 | 1527 | ||
1536 | const SSL_METHOD *DTLS_method(void); /* DTLS v1.0 or later */ | 1528 | const SSL_METHOD *DTLS_method(void); /* DTLS v1.0 or later */ |
1537 | const SSL_METHOD *DTLS_server_method(void); /* DTLS v1.0 or later */ | 1529 | const SSL_METHOD *DTLS_server_method(void); /* DTLS v1.0 or later */ |