diff options
author | tb <> | 2022-07-07 13:02:59 +0000 |
---|---|---|
committer | tb <> | 2022-07-07 13:02:59 +0000 |
commit | 2c28a21e64bf89178dea66220dd347dd20c96666 (patch) | |
tree | 76b423d22bb8ee85075e1bf2278fceea174a18ce /src | |
parent | 0e9a2d4580bc0dcf2809df53a39cb64e9ac8478b (diff) | |
download | openbsd-2c28a21e64bf89178dea66220dd347dd20c96666.tar.gz openbsd-2c28a21e64bf89178dea66220dd347dd20c96666.tar.bz2 openbsd-2c28a21e64bf89178dea66220dd347dd20c96666.zip |
Expose security level symbols and error codes in the headers.
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/ssl.h | 4 | ||||
-rw-r--r-- | src/lib/libssl/tls1.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index c733992848..d9a56b1901 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.218 2022/06/29 17:39:20 beck Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.219 2022/07/07 13:02:59 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 | * |
@@ -1507,7 +1507,6 @@ int SSL_set_session_secret_cb(SSL *s, | |||
1507 | void SSL_set_debug(SSL *s, int debug); | 1507 | void SSL_set_debug(SSL *s, int debug); |
1508 | int SSL_cache_hit(SSL *s); | 1508 | int SSL_cache_hit(SSL *s); |
1509 | 1509 | ||
1510 | #if defined(LIBRESSL_INTERNAL) | ||
1511 | /* What the "other" parameter contains in security callback */ | 1510 | /* What the "other" parameter contains in security callback */ |
1512 | /* Mask for type */ | 1511 | /* Mask for type */ |
1513 | #define SSL_SECOP_OTHER_TYPE 0xffff0000 | 1512 | #define SSL_SECOP_OTHER_TYPE 0xffff0000 |
@@ -1576,7 +1575,6 @@ int SSL_get_security_level(const SSL *ssl); | |||
1576 | 1575 | ||
1577 | void SSL_CTX_set_security_level(SSL_CTX *ctx, int level); | 1576 | void SSL_CTX_set_security_level(SSL_CTX *ctx, int level); |
1578 | int SSL_CTX_get_security_level(const SSL_CTX *ctx); | 1577 | int SSL_CTX_get_security_level(const SSL_CTX *ctx); |
1579 | #endif /* LIBRESSL_INTERNAL */ | ||
1580 | 1578 | ||
1581 | #ifdef LIBRESSL_INTERNAL | 1579 | #ifdef LIBRESSL_INTERNAL |
1582 | /* | 1580 | /* |
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 2f6e2e3bd0..0dadffc8e6 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls1.h,v 1.53 2022/06/29 17:39:20 beck Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.54 2022/07/07 13:02:59 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 | * |
@@ -159,11 +159,9 @@ | |||
159 | extern "C" { | 159 | extern "C" { |
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | #if defined(LIBRESSL_INTERNAL) | ||
163 | #ifndef OPENSSL_TLS_SECURITY_LEVEL | 162 | #ifndef OPENSSL_TLS_SECURITY_LEVEL |
164 | #define OPENSSL_TLS_SECURITY_LEVEL 1 | 163 | #define OPENSSL_TLS_SECURITY_LEVEL 1 |
165 | #endif | 164 | #endif |
166 | #endif | ||
167 | 165 | ||
168 | #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 | 166 | #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 |
169 | 167 | ||