New tls channel id version for OpenSSL

openssl/ssl/ssl_locl.h

 /* ssl/ssl_locl.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 1084 matching lines @@
         unsigned int len, int create_empty_fragement);
 int dtls1_dispatch_alert(SSL *s);
 int dtls1_enc(SSL *s, int snd);
 
 int ssl_init_wbio_buffer(SSL *s, int push);
 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);

[wtc, 2014/04/30 14:11:50]

Nit: tls1_handshake_digest => tls1_handshake_hash ?

Unless handshake digest is the term commonly used in OpenSSL.

[haavardm, 2014/05/05 14:12:45]

Handshake digest seems to be the term OpenSSL uses.

 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);
 int tls1_mac(SSL *ssl, unsigned char *md, int snd);
 int tls1_generate_master_secret(SSL *s, unsigned char *out,
         unsigned char *p, int len);
 int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
         const char *label, size_t llen,
         const unsigned char *p, size_t plen, int use_context);
 int tls1_alert_code(int code);
@@ skipping 36 matching lines @@
 #endif
 int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
                                 const unsigned char *limit, SSL_SESSION **ret);
 
 int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
                                 const EVP_MD *md);
 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);

[wtc, 2014/04/30 14:11:50]

Nit: handshake_hashes => handshake_hash (singular)?

[haavardm, 2014/05/05 14:12:45]

The naming here seems to be a bit inconsistent. I would argue that plural is
correct and that session->original_handshake_hash should be renamed to
original_hashes, since session->original_handshake_hash contains a concatenation
of all hashes in the handshake.

 #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,
                                         int maxlen);
 int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
                                           int *al);
@@ skipping 33 matching lines @@
         size_t data_plus_mac_plus_padding_size,
         const unsigned char *mac_secret,
         unsigned mac_secret_length,
         char is_sslv3);
 
 void tls_fips_digest_extra(
         const EVP_CIPHER_CTX *cipher_ctx, EVP_MD_CTX *mac_ctx,
         const unsigned char *data, size_t data_len, size_t orig_len);
 
 #endif