diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl.h | 7 | ||||
| -rw-r--r-- | src/lib/libssl/tls1.h | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 324691485b..8d4fcc442f 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.159 2018/08/24 20:30:21 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.160 2018/11/06 01:37:23 jsing 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 | * |
| @@ -146,6 +146,7 @@ | |||
| 146 | #include <stdint.h> | 146 | #include <stdint.h> |
| 147 | 147 | ||
| 148 | #include <openssl/opensslconf.h> | 148 | #include <openssl/opensslconf.h> |
| 149 | |||
| 149 | #include <openssl/hmac.h> | 150 | #include <openssl/hmac.h> |
| 150 | #include <openssl/pem.h> | 151 | #include <openssl/pem.h> |
| 151 | #include <openssl/safestack.h> | 152 | #include <openssl/safestack.h> |
| @@ -512,6 +513,10 @@ struct ssl_session_st { | |||
| 512 | #define SSL_OP_NO_TLSv1_2 0x08000000L | 513 | #define SSL_OP_NO_TLSv1_2 0x08000000L |
| 513 | #define SSL_OP_NO_TLSv1_1 0x10000000L | 514 | #define SSL_OP_NO_TLSv1_1 0x10000000L |
| 514 | 515 | ||
| 516 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | ||
| 517 | #define SSL_OP_NO_TLSv1_3 0x20000000L | ||
| 518 | #endif | ||
| 519 | |||
| 515 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ | 520 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ |
| 516 | #define SSL_OP_ALL \ | 521 | #define SSL_OP_ALL \ |
| 517 | (SSL_OP_LEGACY_SERVER_CONNECT) | 522 | (SSL_OP_LEGACY_SERVER_CONNECT) |
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 7ad9a387c9..dd8d778ff6 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.33 2018/11/05 20:41:30 jsing Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.34 2018/11/06 01:37:23 jsing 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 | * |
| @@ -151,6 +151,8 @@ | |||
| 151 | #ifndef HEADER_TLS1_H | 151 | #ifndef HEADER_TLS1_H |
| 152 | #define HEADER_TLS1_H | 152 | #define HEADER_TLS1_H |
| 153 | 153 | ||
| 154 | #include <openssl/opensslconf.h> | ||
| 155 | |||
| 154 | #include <openssl/buffer.h> | 156 | #include <openssl/buffer.h> |
| 155 | 157 | ||
| 156 | #ifdef __cplusplus | 158 | #ifdef __cplusplus |
| @@ -159,6 +161,10 @@ extern "C" { | |||
| 159 | 161 | ||
| 160 | #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 | 162 | #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 |
| 161 | 163 | ||
| 164 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | ||
| 165 | #define TLS1_3_VERSION 0x0304 | ||
| 166 | #endif | ||
| 167 | |||
| 162 | #define TLS1_2_VERSION 0x0303 | 168 | #define TLS1_2_VERSION 0x0303 |
| 163 | #define TLS1_2_VERSION_MAJOR 0x03 | 169 | #define TLS1_2_VERSION_MAJOR 0x03 |
| 164 | #define TLS1_2_VERSION_MINOR 0x03 | 170 | #define TLS1_2_VERSION_MINOR 0x03 |
