diff options
Diffstat (limited to 'src/lib/libssl/ssl_local.h')
| -rw-r--r-- | src/lib/libssl/ssl_local.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index 3a377030b0..7942c36dbd 100644 --- a/src/lib/libssl/ssl_local.h +++ b/src/lib/libssl/ssl_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_local.h,v 1.29 2025/04/18 08:07:36 tb Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.35 2025/12/04 21:16:17 beck 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 | * |
| @@ -490,6 +490,9 @@ typedef struct ssl_handshake_tls13_st { | |||
| 490 | /* Certificate selected for use (static pointer). */ | 490 | /* Certificate selected for use (static pointer). */ |
| 491 | const SSL_CERT_PKEY *cpk; | 491 | const SSL_CERT_PKEY *cpk; |
| 492 | 492 | ||
| 493 | /* Client's extra predicted key share */ | ||
| 494 | struct tls_key_share *key_share; | ||
| 495 | |||
| 493 | /* Version proposed by peer server. */ | 496 | /* Version proposed by peer server. */ |
| 494 | uint16_t server_version; | 497 | uint16_t server_version; |
| 495 | 498 | ||
| @@ -1240,7 +1243,7 @@ int ssl_security_cert_chain(const SSL *ssl, STACK_OF(X509) *sk, | |||
| 1240 | int ssl_security_shared_group(const SSL *ssl, uint16_t group_id); | 1243 | int ssl_security_shared_group(const SSL *ssl, uint16_t group_id); |
| 1241 | int ssl_security_supported_group(const SSL *ssl, uint16_t group_id); | 1244 | int ssl_security_supported_group(const SSL *ssl, uint16_t group_id); |
| 1242 | 1245 | ||
| 1243 | SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int include_ticket); | 1246 | SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int include_ticket); |
| 1244 | int ssl_get_new_session(SSL *s, int session); | 1247 | int ssl_get_new_session(SSL *s, int session); |
| 1245 | int ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, | 1248 | int ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, |
| 1246 | int *alert); | 1249 | int *alert); |
| @@ -1439,9 +1442,10 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out, | |||
| 1439 | unsigned int mac_secret_length); | 1442 | unsigned int mac_secret_length); |
| 1440 | int SSL_state_func_code(int _state); | 1443 | int SSL_state_func_code(int _state); |
| 1441 | 1444 | ||
| 1442 | #define SSLerror(s, r) SSL_error_internal(s, r, OPENSSL_FILE, OPENSSL_LINE) | 1445 | void SSL_error_internal(const SSL *s, int r, const char *f, int l); |
| 1443 | #define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE) | 1446 | #define SSLerror(s, r) SSL_error_internal(s, r, OPENSSL_FILE, OPENSSL_LINE) |
| 1444 | void SSL_error_internal(const SSL *s, int r, char *f, int l); | 1447 | #define SSLerrorx(r) ERR_PUT_error(ERR_LIB_SSL,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE) |
| 1448 | #define SYSerror(r) ERR_PUT_error(ERR_LIB_SYS,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE) | ||
| 1445 | 1449 | ||
| 1446 | #ifndef OPENSSL_NO_SRTP | 1450 | #ifndef OPENSSL_NO_SRTP |
| 1447 | 1451 | ||
