Support TLS Channel IDs in NSS

net/third_party/nss/ssl/sslsock.c

 /*
  * vtables (and methods that call through them) for the 4 types of 
  * SSLSockets supported.  Only one type is still supported.
  * Various other 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
@@ skipping 355 matching lines @@
 #ifdef NSS_PLATFORM_CLIENT_AUTH
             ss->getPlatformClientAuthData    = os->getPlatformClientAuthData;
             ss->getPlatformClientAuthDataArg = os->getPlatformClientAuthDataArg;
 #endif
             ss->sniSocketConfig       = os->sniSocketConfig;
             ss->sniSocketConfigArg    = os->sniSocketConfigArg;
             ss->handleBadCert         = os->handleBadCert;
             ss->badCertArg            = os->badCertArg;
             ss->handshakeCallback     = os->handshakeCallback;
             ss->handshakeCallbackData = os->handshakeCallbackData;
             ss->pkcs11PinArg          = os->pkcs11PinArg;

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

Copy os->channelIDCallback and its argument.

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

Done.

     
             /* Create security data */
             rv = ssl_CopySecurityInfo(ss, os);
             if (rv != SECSuccess) {
                 goto loser;
             }
         }
     }
     return ss;
 
@@ skipping 1293 matching lines @@
         ss->sniSocketConfigArg    = sm->sniSocketConfigArg;
     if (sm->handleBadCert)
         ss->handleBadCert         = sm->handleBadCert;
     if (sm->badCertArg)
         ss->badCertArg            = sm->badCertArg;
     if (sm->handshakeCallback)
         ss->handshakeCallback     = sm->handshakeCallback;
     if (sm->handshakeCallbackData)
         ss->handshakeCallbackData = sm->handshakeCallbackData;
     if (sm->pkcs11PinArg)
         ss->pkcs11PinArg          = sm->pkcs11PinArg;

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

Copy sm->channelIDCallback and its argument.

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

Done.

     return fd;
 loser:
     return NULL;
 #endif
 }
 
 PRBool
 ssl3_VersionIsSupported(SSLProtocolVariant protocolVariant,
                         SSL3ProtocolVersion version)
 {
@@ skipping 170 matching lines @@
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     *handshake_resumed = ss->ssl3.hs.isResuming;
     return SECSuccess;
 }
 
+SECStatus
+SSL_SetClientChannelIDCallback(PRFileDesc *fd,

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

Define this function in sslauth.c, right below the related
SSL_GetClientAuthDataHook function.

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

Done.

+                               SSLClientChannelIDCallback callback,
+                               void *arg) {
+    sslSocket *ss = ssl_FindSocket(fd);
+
+    if (!ss) {
+        SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetClientChannelIDCallback",
+                 SSL_GETPID(), fd));
+        return SECFailure;
+    }
+
+    ss->ssl3.channelIDCallback = callback;
+    ss->ssl3.channelIDCallbackArg = arg;
+
+    return SECSuccess;
+}
+
 const SECItem *
 SSL_GetRequestedClientCertificateTypes(PRFileDesc *fd)
 {
   sslSocket *ss = ssl_FindSocket(fd);
 
   if (!ss) {
       SSL_DBG(("%d: SSL[%d]: bad socket in "
                "SSL_GetRequestedClientCertificateTypes", SSL_GETPID(), fd));
       return NULL;
   }
@@ skipping 1039 matching lines @@
         ss->authCertificateArg = (void *)ss->dbHandle;
         ss->sniSocketConfig    = NULL;
         ss->sniSocketConfigArg = NULL;
         ss->getClientAuthData  = NULL;
 #ifdef NSS_PLATFORM_CLIENT_AUTH
         ss->getPlatformClientAuthData = NULL;
         ss->getPlatformClientAuthDataArg = NULL;
 #endif   /* NSS_PLATFORM_CLIENT_AUTH */
         ss->handleBadCert      = NULL;
         ss->badCertArg         = NULL;
         ss->pkcs11PinArg       = NULL;

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

Initialize ss->channelIDCallback and its argument to NULL
explicitly here?

This is not necessary because the entire 'ss' structure is
allocated zero-filled.  But we initialize many other callbacks
to NULL explicitly here.

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

Done.

 
         ssl_ChooseOps(ss);
         ssl2_InitSocketPolicy(ss);
         ssl3_InitSocketPolicy(ss);
 
         if (makeLocks) {
             status = ssl_MakeLocks(ss);
             if (status != SECSuccess)
                 goto loser;
         }
         status = ssl_CreateSecurityInfo(ss);
         if (status != SECSuccess) 
             goto loser;
         status = ssl_InitGather(&ss->gs);
         if (status != SECSuccess) {
 loser:
             ssl_DestroySocketContents(ss);
             ssl_DestroyLocks(ss);
             PORT_Free(ss);
             ss = NULL;
         }
         ss->protocolVariant = protocolVariant;
     }
     return ss;
 }