Support new ChannelID extension.

net/third_party/nss/ssl/ssl3ext.c

 /*
  * SSL3 Protocol
  *
  * 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/. */
 
 /* TLS extension code moved here from ssl3ecc.c */
 
 #include "nssrenam.h"
@@ skipping 794 matching lines @@
     PRInt32 extension_length = 4;
 
     if (!ss->getChannelID)
         return 0;
 
     if (maxBytes < extension_length) {
         PORT_Assert(0);
         return 0;
     }
 
+    if (ss->ssl3.hs.isResuming &&
+        ss->sec.ci.sid->u.ssl3.originalHandshakeHash.len == 0) {
+        /* We can't do ChannelID on a connection if we're resuming and didn't
+         * do ChannelID on the original connection: without ChannelID on the
+         * original connection we didn't record the handshake hashes needed for
+         * the signature. */
+        return 0;

[wtc, 2013/11/14 20:25:00]

We probably should add a PORT_Assert(0) here because reaching this point would
indicate an NSS bug.

[agl, 2013/11/15 18:48:27]

Done.

+    }
+
     if (append) {
         SECStatus rv;
         rv = ssl3_AppendHandshakeNumber(ss, ssl_channel_id_xtn, 2);
         if (rv != SECSuccess)
             goto loser;
         rv = ssl3_AppendHandshakeNumber(ss, 0, 2);
         if (rv != SECSuccess)
             goto loser;
         ss->xtnData.advertised[ss->xtnData.numAdvertised++] =
                 ssl_channel_id_xtn;
@@ skipping 1522 matching lines @@
     if (SECSuccess != ssl3_AppendHandshakeNumber(ss, ssl_padding_xtn, 2))
         return -1;
     if (SECSuccess != ssl3_AppendHandshakeNumber(ss, paddingLen, 2))
         return -1;
     memset(padding, ' ', paddingLen);
     if (SECSuccess != ssl3_AppendHandshake(ss, padding, paddingLen))
         return -1;
 
     return extensionLen;
 }