Support TLS Channel IDs in NSS

net/third_party/nss/ssl/ssl.h

Index: net/third_party/nss/ssl/ssl.h
diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h
index 1368e2f730a6f6fa51aa29ceb2d55daeb05ddf90..5cdbff5affe60dd84513b4540d75a38e73628948 100644
--- a/net/third_party/nss/ssl/ssl.h
+++ b/net/third_party/nss/ssl/ssl.h
@@ -945,6 +945,13 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
 SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd,
                                                  PRBool *last_handshake_resumed);
 
+/* SSL_SetChannelD sets a P-256, ECC private key to use as the TLS Channel ID.

[wtc, 2012/05/24 23:10:03]

"Channel ID" is not specific enough. I think we should name
it "Client ID" or "Client Channel ID".

[agl, 2012/05/30 15:28:33]

Done.

+ * This is only applicable to client sockets and is only effective when the
+ * server supports TLS Channel ID. Note that this function takes ownership of
+ * |id| and |pub|. */
+SSL_IMPORT SECStatus SSL_SetChannelD(PRFileDesc *fd, SECKEYPrivateKey *id,

[wtc, 2012/05/24 23:10:03]

Typo: SSL_SetChannelD => SSL_SetChannelID

The comment above has the same typo.

[agl, 2012/05/30 15:28:33]

Done.

+                                     SECKEYPublicKey *pub);
+
 /*
 ** How long should we wait before retransmitting the next flight of
 ** the DTLS handshake? Returns SECFailure if not DTLS or not in a