Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: openssl/ssl/ssl_locl.h

Issue 270103002: Revert of New tls channel id version for OpenSSL (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/ssl/ssl.h ('k') | openssl/ssl/t1_enc.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ssl/ssl_locl.h */ 1 /* ssl/ssl_locl.h */
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 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 unsigned int len, int create_empty_fragement); 1095 unsigned int len, int create_empty_fragement);
1096 int dtls1_dispatch_alert(SSL *s); 1096 int dtls1_dispatch_alert(SSL *s);
1097 int dtls1_enc(SSL *s, int snd); 1097 int dtls1_enc(SSL *s, int snd);
1098 1098
1099 int ssl_init_wbio_buffer(SSL *s, int push); 1099 int ssl_init_wbio_buffer(SSL *s, int push);
1100 void ssl_free_wbio_buffer(SSL *s); 1100 void ssl_free_wbio_buffer(SSL *s);
1101 1101
1102 int tls1_change_cipher_state(SSL *s, int which); 1102 int tls1_change_cipher_state(SSL *s, int which);
1103 int tls1_setup_key_block(SSL *s); 1103 int tls1_setup_key_block(SSL *s);
1104 int tls1_enc(SSL *s, int snd); 1104 int tls1_enc(SSL *s, int snd);
1105 int tls1_handshake_digest(SSL *s, unsigned char *out, size_t out_len);
1106 int tls1_final_finish_mac(SSL *s, 1105 int tls1_final_finish_mac(SSL *s,
1107 const char *str, int slen, unsigned char *p); 1106 const char *str, int slen, unsigned char *p);
1108 int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p); 1107 int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
1109 int tls1_mac(SSL *ssl, unsigned char *md, int snd); 1108 int tls1_mac(SSL *ssl, unsigned char *md, int snd);
1110 int tls1_generate_master_secret(SSL *s, unsigned char *out, 1109 int tls1_generate_master_secret(SSL *s, unsigned char *out,
1111 unsigned char *p, int len); 1110 unsigned char *p, int len);
1112 int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 1111 int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
1113 const char *label, size_t llen, 1112 const char *label, size_t llen,
1114 const unsigned char *p, size_t plen, int use_context); 1113 const unsigned char *p, size_t plen, int use_context);
1115 int tls1_alert_code(int code); 1114 int tls1_alert_code(int code);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 #endif 1151 #endif
1153 int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, 1152 int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
1154 const unsigned char *limit, SSL_SESSION **ret); 1153 const unsigned char *limit, SSL_SESSION **ret);
1155 1154
1156 int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, 1155 int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
1157 const EVP_MD *md); 1156 const EVP_MD *md);
1158 int tls12_get_sigid(const EVP_PKEY *pk); 1157 int tls12_get_sigid(const EVP_PKEY *pk);
1159 const EVP_MD *tls12_get_hash(unsigned char hash_alg); 1158 const EVP_MD *tls12_get_hash(unsigned char hash_alg);
1160 1159
1161 int tls1_channel_id_hash(EVP_MD_CTX *ctx, SSL *s); 1160 int tls1_channel_id_hash(EVP_MD_CTX *ctx, SSL *s);
1162 int tls1_record_handshake_hashes_for_channel_id(SSL *s);
1163 #endif 1161 #endif
1164 1162
1165 int ssl3_can_cutthrough(const SSL *s); 1163 int ssl3_can_cutthrough(const SSL *s);
1166 1164
1167 EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ; 1165 EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ;
1168 void ssl_clear_hash_ctx(EVP_MD_CTX **hash); 1166 void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
1169 int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len, 1167 int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
1170 int maxlen); 1168 int maxlen);
1171 int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 1169 int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
1172 int *al); 1170 int *al);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 size_t data_plus_mac_plus_padding_size, 1204 size_t data_plus_mac_plus_padding_size,
1207 const unsigned char *mac_secret, 1205 const unsigned char *mac_secret,
1208 unsigned mac_secret_length, 1206 unsigned mac_secret_length,
1209 char is_sslv3); 1207 char is_sslv3);
1210 1208
1211 void tls_fips_digest_extra( 1209 void tls_fips_digest_extra(
1212 const EVP_CIPHER_CTX *cipher_ctx, EVP_MD_CTX *mac_ctx, 1210 const EVP_CIPHER_CTX *cipher_ctx, EVP_MD_CTX *mac_ctx,
1213 const unsigned char *data, size_t data_len, size_t orig_len); 1211 const unsigned char *data, size_t data_len, size_t orig_len);
1214 1212
1215 #endif 1213 #endif
OLDNEW
« no previous file with comments | « openssl/ssl/ssl.h ('k') | openssl/ssl/t1_enc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698