Support new ChannelID extension.

net/third_party/nss/ssl/sslimpl.h

 /*
  * This file is PRIVATE to SSL and should be the first thing included by
  * any SSL implementation file.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ skipping 680 matching lines @@
             PRUint16          clAuthSeries;
 
             char              masterValid;
             char              clAuthValid;
 
             /* Session ticket if we have one, is sent as an extension in the
              * ClientHello message.  This field is used by clients.
              */
             NewSessionTicket  sessionTicket;
             SECItem           srvName;
+
+            /* lastHandshakeHash contains the hash of the original, full
+             * handshake. This is either a SHA-1/MD5 combination (for TLS <

[wtc, 2013/11/14 00:50:56]

IMPORTANT: this hash does not include the final handshake message flow from the
server (optional NewSessionTicket, and Finished). So this comment is confusing.

[agl, 2013/11/14 18:50:42]

Done.

+             * 1.2) or a SHA-2 hash (for TLS 1.2). This is recorded and used

[wtc, 2013/11/14 00:50:56]

To be future proof, we should say this is the hash of the TLS PRF for TLS 1.2.

[agl, 2013/11/14 18:50:42]

Done.

+             * only when ChannelID is negotiated as it's used to bind the
+             * ChannelID signature on the resumption handshake to the original
+             * handshake. */
+            SECItem           lastHandshakeHash;

[wtc, 2013/11/14 00:50:56]

Nit: "last" can also be interpreted to mean the initial handshake (as opposed to
a subsequent renegotiation), or even the previous handshake. Perhaps we should
name this "fullHandshakeHash" or "originalHandshakeHash"?

[agl, 2013/11/14 18:50:42]

Went with originalHandshakeHash.

         } ssl3;
     } u;
 };
 
 
 typedef struct ssl3CipherSuiteDefStr {
     ssl3CipherSuite          cipher_suite;
     SSL3BulkCipher           bulk_cipher_alg;
     SSL3MACAlgorithm         mac_alg;
     SSL3KeyExchangeAlgorithm key_exchange_alg;
@@ skipping 1231 matching lines @@
 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
 #define SSL_GETPID getpid
 #elif defined(WIN32)
 extern int __cdecl _getpid(void);
 #define SSL_GETPID _getpid
 #else
 #define SSL_GETPID() 0
 #endif
 
 #endif /* __sslimpl_h_ */