diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 3c58e5ac21..ea1ee084a0 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_locl.h,v 1.363 2021/10/23 14:40:54 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.364 2021/10/23 15:02:27 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 | * |
| @@ -670,8 +670,6 @@ void tls12_record_layer_write_epoch_done(struct tls12_record_layer *rl, | |||
| 670 | void tls12_record_layer_clear_read_state(struct tls12_record_layer *rl); | 670 | void tls12_record_layer_clear_read_state(struct tls12_record_layer *rl); |
| 671 | void tls12_record_layer_clear_write_state(struct tls12_record_layer *rl); | 671 | void tls12_record_layer_clear_write_state(struct tls12_record_layer *rl); |
| 672 | void tls12_record_layer_reflect_seq_num(struct tls12_record_layer *rl); | 672 | void tls12_record_layer_reflect_seq_num(struct tls12_record_layer *rl); |
| 673 | void tls12_record_layer_read_cipher_hash(struct tls12_record_layer *rl, | ||
| 674 | EVP_CIPHER_CTX **cipher, EVP_MD_CTX **hash); | ||
| 675 | int tls12_record_layer_change_read_cipher_state(struct tls12_record_layer *rl, | 673 | int tls12_record_layer_change_read_cipher_state(struct tls12_record_layer *rl, |
| 676 | CBS *mac_key, CBS *key, CBS *iv); | 674 | CBS *mac_key, CBS *key, CBS *iv); |
| 677 | int tls12_record_layer_change_write_cipher_state(struct tls12_record_layer *rl, | 675 | int tls12_record_layer_change_write_cipher_state(struct tls12_record_layer *rl, |
| @@ -1095,14 +1093,6 @@ struct ssl_st { | |||
| 1095 | SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */ | 1093 | SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */ |
| 1096 | #define session_ctx initial_ctx | 1094 | #define session_ctx initial_ctx |
| 1097 | 1095 | ||
| 1098 | /* | ||
| 1099 | * XXX really should be internal, but is | ||
| 1100 | * touched unnaturally by wpa-supplicant | ||
| 1101 | * and freeradius and other perversions | ||
| 1102 | */ | ||
| 1103 | EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */ | ||
| 1104 | EVP_MD_CTX *read_hash; /* used for mac generation */ | ||
| 1105 | |||
| 1106 | struct ssl_internal_st *internal; | 1096 | struct ssl_internal_st *internal; |
| 1107 | }; | 1097 | }; |
| 1108 | 1098 | ||
| @@ -1310,8 +1300,6 @@ const SSL_METHOD *tls_legacy_method(void); | |||
| 1310 | const SSL_METHOD *ssl_get_method(uint16_t version); | 1300 | const SSL_METHOD *ssl_get_method(uint16_t version); |
| 1311 | 1301 | ||
| 1312 | void ssl_clear_cipher_state(SSL *s); | 1302 | void ssl_clear_cipher_state(SSL *s); |
| 1313 | void ssl_clear_cipher_read_state(SSL *s); | ||
| 1314 | void ssl_clear_cipher_write_state(SSL *s); | ||
| 1315 | int ssl_clear_bad_session(SSL *s); | 1303 | int ssl_clear_bad_session(SSL *s); |
| 1316 | 1304 | ||
| 1317 | void ssl_info_callback(const SSL *s, int type, int value); | 1305 | void ssl_info_callback(const SSL *s, int type, int value); |
