summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 3f5d6fad20..b68b680106 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.177 2017/03/05 14:39:53 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.178 2017/03/10 16:03: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 *
@@ -805,10 +805,6 @@ typedef struct ssl3_state_internal_st {
805 805
806 /* used during startup, digest all incoming/outgoing packets */ 806 /* used during startup, digest all incoming/outgoing packets */
807 BIO *handshake_buffer; 807 BIO *handshake_buffer;
808 /* When set of handshake digests is determined, buffer is hashed
809 * and freed and MD_CTX-es for all required digests are stored in
810 * this array */
811 EVP_MD_CTX **handshake_dgst;
812 808
813 /* Rolling hash of handshake messages. */ 809 /* Rolling hash of handshake messages. */
814 EVP_MD_CTX *handshake_hash; 810 EVP_MD_CTX *handshake_hash;
@@ -1103,7 +1099,6 @@ void ssl_update_cache(SSL *s, int mode);
1103int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 1099int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
1104 const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size); 1100 const EVP_MD **md, int *mac_pkey_type, int *mac_secret_size);
1105int ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead); 1101int ssl_cipher_get_evp_aead(const SSL_SESSION *s, const EVP_AEAD **aead);
1106int ssl_get_handshake_digest(int i, long *mask, const EVP_MD **md);
1107int ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md); 1102int ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md);
1108 1103
1109int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk); 1104int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk);
@@ -1293,7 +1288,6 @@ int tls1_change_cipher_state(SSL *s, int which);
1293int tls1_setup_key_block(SSL *s); 1288int tls1_setup_key_block(SSL *s);
1294int tls1_enc(SSL *s, int snd); 1289int tls1_enc(SSL *s, int snd);
1295int tls1_final_finish_mac(SSL *s, const char *str, int slen, unsigned char *p); 1290int tls1_final_finish_mac(SSL *s, const char *str, int slen, unsigned char *p);
1296int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
1297int tls1_mac(SSL *ssl, unsigned char *md, int snd); 1291int tls1_mac(SSL *ssl, unsigned char *md, int snd);
1298int tls1_generate_master_secret(SSL *s, unsigned char *out, 1292int tls1_generate_master_secret(SSL *s, unsigned char *out,
1299 unsigned char *p, int len); 1293 unsigned char *p, int len);