diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-06-15 22:21:10 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-15 22:21:10 +0200 |
commit | c35453897494d2b488961f7a446b4df8e24c6f31 (patch) | |
tree | a454987f969b676b446a518ed51e70e9bc9e00ca /main/openssl/ssl/ssl_locl.h | |
parent | 5d397e6220daa87129883a93353286cd6ffd18e8 (diff) |
Update OpenSSL to 1.0.1h
Diffstat (limited to 'main/openssl/ssl/ssl_locl.h')
-rw-r--r-- | main/openssl/ssl/ssl_locl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/openssl/ssl/ssl_locl.h b/main/openssl/ssl/ssl_locl.h index f79ab009..6b7731a4 100644 --- a/main/openssl/ssl/ssl_locl.h +++ b/main/openssl/ssl/ssl_locl.h @@ -1070,6 +1070,7 @@ void ssl_free_wbio_buffer(SSL *s); int tls1_change_cipher_state(SSL *s, int which); int tls1_setup_key_block(SSL *s); int tls1_enc(SSL *s, int snd); +int tls1_handshake_digest(SSL *s, unsigned char *out, size_t out_len); int tls1_final_finish_mac(SSL *s, const char *str, int slen, unsigned char *p); int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p); @@ -1126,8 +1127,10 @@ int tls12_get_sigid(const EVP_PKEY *pk); const EVP_MD *tls12_get_hash(unsigned char hash_alg); int tls1_channel_id_hash(EVP_MD_CTX *ctx, SSL *s); +int tls1_record_handshake_hashes_for_channel_id(SSL *s); #endif +int ssl3_can_cutthrough(const SSL *s); EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ; void ssl_clear_hash_ctx(EVP_MD_CTX **hash); int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len, |