diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index a1ed22b778..e8a11ebdb9 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.247 2025/03/12 14:03:55 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.248 2025/04/18 07:34:01 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 | * |
@@ -231,9 +231,9 @@ extern "C" { | |||
231 | #define SSL_TXT_kRSA "kRSA" | 231 | #define SSL_TXT_kRSA "kRSA" |
232 | #define SSL_TXT_kDHr "kDHr" /* no such ciphersuites supported! */ | 232 | #define SSL_TXT_kDHr "kDHr" /* no such ciphersuites supported! */ |
233 | #define SSL_TXT_kDHd "kDHd" /* no such ciphersuites supported! */ | 233 | #define SSL_TXT_kDHd "kDHd" /* no such ciphersuites supported! */ |
234 | #define SSL_TXT_kDH "kDH" /* no such ciphersuites supported! */ | 234 | #define SSL_TXT_kDH "kDH" /* no such ciphersuites supported! */ |
235 | #define SSL_TXT_kEDH "kEDH" | 235 | #define SSL_TXT_kEDH "kEDH" |
236 | #define SSL_TXT_kKRB5 "kKRB5" | 236 | #define SSL_TXT_kKRB5 "kKRB5" |
237 | #define SSL_TXT_kECDHr "kECDHr" | 237 | #define SSL_TXT_kECDHr "kECDHr" |
238 | #define SSL_TXT_kECDHe "kECDHe" | 238 | #define SSL_TXT_kECDHe "kECDHe" |
239 | #define SSL_TXT_kECDH "kECDH" | 239 | #define SSL_TXT_kECDH "kECDH" |
@@ -245,7 +245,7 @@ extern "C" { | |||
245 | #define SSL_TXT_aDSS "aDSS" | 245 | #define SSL_TXT_aDSS "aDSS" |
246 | #define SSL_TXT_aDH "aDH" /* no such ciphersuites supported! */ | 246 | #define SSL_TXT_aDH "aDH" /* no such ciphersuites supported! */ |
247 | #define SSL_TXT_aECDH "aECDH" | 247 | #define SSL_TXT_aECDH "aECDH" |
248 | #define SSL_TXT_aKRB5 "aKRB5" | 248 | #define SSL_TXT_aKRB5 "aKRB5" |
249 | #define SSL_TXT_aECDSA "aECDSA" | 249 | #define SSL_TXT_aECDSA "aECDSA" |
250 | #define SSL_TXT_aPSK "aPSK" | 250 | #define SSL_TXT_aPSK "aPSK" |
251 | 251 | ||
@@ -260,7 +260,7 @@ extern "C" { | |||
260 | #define SSL_TXT_EECDH "EECDH" /* previous name for ECDHE */ | 260 | #define SSL_TXT_EECDH "EECDH" /* previous name for ECDHE */ |
261 | #define SSL_TXT_AECDH "AECDH" | 261 | #define SSL_TXT_AECDH "AECDH" |
262 | #define SSL_TXT_ECDSA "ECDSA" | 262 | #define SSL_TXT_ECDSA "ECDSA" |
263 | #define SSL_TXT_KRB5 "KRB5" | 263 | #define SSL_TXT_KRB5 "KRB5" |
264 | #define SSL_TXT_PSK "PSK" | 264 | #define SSL_TXT_PSK "PSK" |
265 | #define SSL_TXT_SRP "SRP" | 265 | #define SSL_TXT_SRP "SRP" |
266 | 266 | ||
@@ -1117,7 +1117,7 @@ const SSL_CIPHER *SSL_get_current_cipher(const SSL *s); | |||
1117 | int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits); | 1117 | int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits); |
1118 | const char * SSL_CIPHER_get_version(const SSL_CIPHER *c); | 1118 | const char * SSL_CIPHER_get_version(const SSL_CIPHER *c); |
1119 | const char * SSL_CIPHER_get_name(const SSL_CIPHER *c); | 1119 | const char * SSL_CIPHER_get_name(const SSL_CIPHER *c); |
1120 | unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c); | 1120 | unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c); |
1121 | uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c); | 1121 | uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c); |
1122 | const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); | 1122 | const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); |
1123 | int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c); | 1123 | int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c); |
@@ -1272,16 +1272,16 @@ int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm); | |||
1272 | SSL *SSL_new(SSL_CTX *ctx); | 1272 | SSL *SSL_new(SSL_CTX *ctx); |
1273 | void SSL_free(SSL *ssl); | 1273 | void SSL_free(SSL *ssl); |
1274 | int SSL_up_ref(SSL *ssl); | 1274 | int SSL_up_ref(SSL *ssl); |
1275 | int SSL_accept(SSL *ssl); | 1275 | int SSL_accept(SSL *ssl); |
1276 | int SSL_connect(SSL *ssl); | 1276 | int SSL_connect(SSL *ssl); |
1277 | int SSL_is_dtls(const SSL *s); | 1277 | int SSL_is_dtls(const SSL *s); |
1278 | int SSL_is_server(const SSL *s); | 1278 | int SSL_is_server(const SSL *s); |
1279 | int SSL_read(SSL *ssl, void *buf, int num); | 1279 | int SSL_read(SSL *ssl, void *buf, int num); |
1280 | int SSL_peek(SSL *ssl, void *buf, int num); | 1280 | int SSL_peek(SSL *ssl, void *buf, int num); |
1281 | int SSL_write(SSL *ssl, const void *buf, int num); | 1281 | int SSL_write(SSL *ssl, const void *buf, int num); |
1282 | int SSL_read_ex(SSL *ssl, void *buf, size_t num, size_t *bytes_read); | 1282 | int SSL_read_ex(SSL *ssl, void *buf, size_t num, size_t *bytes_read); |
1283 | int SSL_peek_ex(SSL *ssl, void *buf, size_t num, size_t *bytes_peeked); | 1283 | int SSL_peek_ex(SSL *ssl, void *buf, size_t num, size_t *bytes_peeked); |
1284 | int SSL_write_ex(SSL *ssl, const void *buf, size_t num, size_t *bytes_written); | 1284 | int SSL_write_ex(SSL *ssl, const void *buf, size_t num, size_t *bytes_written); |
1285 | 1285 | ||
1286 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 1286 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
1287 | uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx); | 1287 | uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx); |