diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index b6d71492fd..a4e831577d 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.212 2018/08/30 16:56:16 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.213 2018/09/05 16:48:11 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 | * |
@@ -1039,7 +1039,9 @@ extern SSL3_ENC_METHOD TLSv1_enc_data; | |||
1039 | extern SSL3_ENC_METHOD TLSv1_1_enc_data; | 1039 | extern SSL3_ENC_METHOD TLSv1_1_enc_data; |
1040 | extern SSL3_ENC_METHOD TLSv1_2_enc_data; | 1040 | extern SSL3_ENC_METHOD TLSv1_2_enc_data; |
1041 | 1041 | ||
1042 | void ssl_clear_cipher_ctx(SSL *s); | 1042 | void ssl_clear_cipher_state(SSL *s); |
1043 | void ssl_clear_cipher_read_state(SSL *s); | ||
1044 | void ssl_clear_cipher_write_state(SSL *s); | ||
1043 | int ssl_clear_bad_session(SSL *s); | 1045 | int ssl_clear_bad_session(SSL *s); |
1044 | CERT *ssl_cert_new(void); | 1046 | CERT *ssl_cert_new(void); |
1045 | CERT *ssl_cert_dup(CERT *cert); | 1047 | CERT *ssl_cert_dup(CERT *cert); |
@@ -1279,7 +1281,6 @@ int tls12_get_sigid(const EVP_PKEY *pk); | |||
1279 | int tls12_get_hashandsig(CBB *cbb, const EVP_PKEY *pk, const EVP_MD *md); | 1281 | int tls12_get_hashandsig(CBB *cbb, const EVP_PKEY *pk, const EVP_MD *md); |
1280 | const EVP_MD *tls12_get_hash(unsigned char hash_alg); | 1282 | const EVP_MD *tls12_get_hash(unsigned char hash_alg); |
1281 | 1283 | ||
1282 | void ssl_clear_hash_ctx(EVP_MD_CTX **hash); | ||
1283 | long ssl_get_algorithm2(SSL *s); | 1284 | long ssl_get_algorithm2(SSL *s); |
1284 | int tls1_process_sigalgs(SSL *s, CBS *cbs); | 1285 | int tls1_process_sigalgs(SSL *s, CBS *cbs); |
1285 | void tls12_get_req_sig_algs(SSL *s, unsigned char **sigalgs, | 1286 | void tls12_get_req_sig_algs(SSL *s, unsigned char **sigalgs, |