summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl.h10
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);
1465int SSL_up_ref(SSL *ssl); 1461int SSL_up_ref(SSL *ssl);
1466int SSL_accept(SSL *ssl); 1462int SSL_accept(SSL *ssl);
1467int SSL_connect(SSL *ssl); 1463int SSL_connect(SSL *ssl);
1468#ifdef LIBRESSL_INTERNAL
1469int SSL_is_dtls(const SSL *s); 1464int SSL_is_dtls(const SSL *s);
1470#endif
1471int SSL_is_server(const SSL *s); 1465int SSL_is_server(const SSL *s);
1472int SSL_read(SSL *ssl, void *buf, int num); 1466int SSL_read(SSL *ssl, void *buf, int num);
1473int SSL_peek(SSL *ssl, void *buf, int num); 1467int SSL_peek(SSL *ssl, void *buf, int num);
@@ -1527,11 +1521,9 @@ const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
1527const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */ 1521const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
1528const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */ 1522const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
1529 1523
1530#if defined(LIBRESSL_HAS_DTLS1_2) || defined(LIBRESSL_INTERNAL)
1531const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */ 1524const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */
1532const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */ 1525const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */
1533const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */ 1526const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */
1534#endif
1535 1527
1536const SSL_METHOD *DTLS_method(void); /* DTLS v1.0 or later */ 1528const SSL_METHOD *DTLS_method(void); /* DTLS v1.0 or later */
1537const SSL_METHOD *DTLS_server_method(void); /* DTLS v1.0 or later */ 1529const SSL_METHOD *DTLS_server_method(void); /* DTLS v1.0 or later */