Support TLS Channel IDs in NSS

net/third_party/nss/ssl/ssl.h

 /*
  * This file contains prototypes for the public SSL functions.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 927 matching lines @@
 ** Did the handshake with the peer negotiate the given extension?
 ** Output parameter valid only if function returns SECSuccess
 */
 SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc * socket,
                                                       SSLExtensionType extId,
                                                       PRBool *yes);
 
 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
 ** handshake.
 */
 SSL_IMPORT SECStatus DTLS_GetTimeout(PRFileDesc *socket,
                                      PRIntervalTime *timeout);
 
 /*
  * Return a boolean that indicates whether the underlying library
@@ skipping 71 matching lines @@
  * should continue using the connection. If the application passes a non-zero
  * value for second argument (error), or if SSL_AuthCertificateComplete returns
  * anything other than SECSuccess, then the application should close the
  * connection.
  */
 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
                                                  PRErrorCode error);
 SEC_END_PROTOS
 
 #endif /* __ssl_h_ */