New tls channel id version for OpenSSL

openssl/ssl/s3_clnt.c

 /* ssl/s3_clnt.c */
 /* 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 565 matching lines @@
                                 else
                                         {
 #ifndef OPENSSL_NO_TLSEXT
                                         /* Allow NewSessionTicket if ticket expected */
                                         if (s->tlsext_ticket_expected)
                                                 s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
                                         else
 #endif
                                                 s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
                                         }
+                                        if (s->s3->tlsext_channel_id_valid)
+                                        {
+                                        /* This is a non-resumption handshake. If it
+                                         * involves ChannelID, then record the
+                                         * handshake hashes at this point in the
+                                         * session so that any resumption of this
+                                         * session with ChannelID can sign those
+                                         * hashes. */
+                                        ret = tls1_record_handshake_hashes_for_channel_id(s);
+                                        if (ret <= 0)
+                                                goto end;
+                                        }
                                 }
                         s->init_num=0;
                         break;
 
 #ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_CR_SESSION_TICKET_A:
                 case SSL3_ST_CR_SESSION_TICKET_B:
                         ret=ssl3_get_new_session_ticket(s);
                         if (ret <= 0) goto end;
                         s->state=SSL3_ST_CR_FINISHED_A;
@@ skipping 2975 matching lines @@
                                                 SSL_get_client_CA_list(s),
                                                 px509, ppkey, NULL, NULL, NULL);
                 if (i != 0)
                         return i;
                 }
 #endif
         if (s->ctx->client_cert_cb)
                 i = s->ctx->client_cert_cb(s,px509,ppkey);
         return i;
         }