diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 22d4809868..e63312a123 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.237 2024/05/27 09:12:31 jsg Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.238 2024/07/13 18:33:18 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 | * |
@@ -653,11 +653,9 @@ void SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb); | |||
653 | } | 653 | } |
654 | #endif | 654 | #endif |
655 | 655 | ||
656 | #include <openssl/ssl2.h> | ||
657 | #include <openssl/ssl3.h> | 656 | #include <openssl/ssl3.h> |
658 | #include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */ | 657 | #include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */ |
659 | #include <openssl/dtls1.h> /* Datagram TLS */ | 658 | #include <openssl/dtls1.h> /* Datagram TLS */ |
660 | #include <openssl/ssl23.h> | ||
661 | #include <openssl/srtp.h> /* Support for the use_srtp extension */ | 659 | #include <openssl/srtp.h> /* Support for the use_srtp extension */ |
662 | 660 | ||
663 | #ifdef __cplusplus | 661 | #ifdef __cplusplus |
@@ -2331,6 +2329,12 @@ void ERR_load_SSL_strings(void); | |||
2331 | int OPENSSL_init_ssl(uint64_t opts, const void *settings); | 2329 | int OPENSSL_init_ssl(uint64_t opts, const void *settings); |
2332 | int SSL_library_init(void); | 2330 | int SSL_library_init(void); |
2333 | 2331 | ||
2332 | /* | ||
2333 | * A few things still use this without #ifdef guard. | ||
2334 | */ | ||
2335 | |||
2336 | #define SSL2_VERSION 0x0002 | ||
2337 | |||
2334 | #ifdef __cplusplus | 2338 | #ifdef __cplusplus |
2335 | } | 2339 | } |
2336 | #endif | 2340 | #endif |