Support TLS Channel IDs in NSS

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.
  *
  * ***** 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
@@ skipping 931 matching lines @@
                             /* used by server.  trusted CAs for this socket. */
     PRBool               initialized;
     SSL3HandshakeState   hs;
     ssl3CipherSpec       specs[2];      /* one is current, one is pending. */
 
     /* In a client: if the server supports Next Protocol Negotiation, then
      * this is the protocol that was negotiated.
      */
     SECItem              nextProto;
     SSLNextProtoState    nextProtoState;
+    SSLClientChannelIDCallback channelIDCallback;
+    void *               channelIDCallbackArg;
 
     PRUint16             mtu;   /* Our estimate of the MTU */
 };
 
 #define DTLS_MAX_MTU  1500      /* Ethernet MTU but without subtracting the
                                  * headers, so slightly larger than expected */
 #define IS_DTLS(ss) (ss->protocolVariant == ssl_variant_datagram)
 
 typedef struct {
     SSL3ContentType      type;
@@ skipping 228 matching lines @@
     void                        *getPlatformClientAuthDataArg;
 #endif  /* NSS_PLATFORM_CLIENT_AUTH */
     SSLSNISocketConfig        sniSocketConfig;
     void                     *sniSocketConfigArg;
     SSLBadCertHandler         handleBadCert;
     void                     *badCertArg;
     SSLHandshakeCallback      handshakeCallback;
     void                     *handshakeCallbackData;
     void                     *pkcs11PinArg;
     SSLNextProtoCallback      nextProtoCallback;
     void                     *nextProtoArg;

[wtc, 2012/05/31 00:36:32]

channelIDCallback and its argument should be added here.

Perhaps the callback should be named getChannelID to
match the similar callback "getClientAuthData" (see lines
1188-1189).

[agl, 2012/05/31 17:19:53]

Done.

 
     PRIntervalTime            rTimeout; /* timeout for NSPR I/O */
     PRIntervalTime            wTimeout; /* timeout for NSPR I/O */
     PRIntervalTime            cTimeout; /* timeout for NSPR I/O */
 
     PZLock *      recvLock;     /* lock against multiple reader threads. */
     PZLock *      sendLock;     /* lock against multiple sender threads. */
 
     PZMonitor *   recvBufLock;  /* locks low level recv buffers. */
     PZMonitor *   xmitBufLock;  /* locks low level xmit buffers. */
@@ skipping 685 matching lines @@
 #elif defined(_WIN32_WCE)
 #define SSL_GETPID GetCurrentProcessId
 #elif defined(WIN32)
 extern int __cdecl _getpid(void);
 #define SSL_GETPID _getpid
 #else
 #define SSL_GETPID() 0
 #endif
 
 #endif /* __sslimpl_h_ */