Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/patches/clientauth.patch

 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c     2013-07-31 12:31:45.326118409 -0700
-+++ b/nss/lib/ssl/ssl3con.c     2013-07-31 12:35:27.189373289 -0700
-@@ -2284,6 +2284,9 @@ ssl3_ClientAuthTokenPresent(sslSessionID
+--- a/nss/lib/ssl/ssl3con.c     2014-01-03 19:30:40.073373382 -0800
++++ b/nss/lib/ssl/ssl3con.c     2014-01-03 19:30:52.653579045 -0800
+@@ -2471,6 +2471,9 @@ ssl3_ClientAuthTokenPresent(sslSessionID
      PRBool isPresent = PR_TRUE;
  
      /* we only care if we are doing client auth */
 +    /* If NSS_PLATFORM_CLIENT_AUTH is defined and a platformClientKey is being
 +     * used, u.ssl3.clAuthValid will be false and this function will always
 +     * return PR_TRUE. */
      if (!sid || !sid->u.ssl3.clAuthValid) {
         return PR_TRUE;
      }
-@@ -5768,25 +5771,36 @@ ssl3_SendCertificateVerify(sslSocket *ss
+@@ -6080,25 +6083,36 @@ ssl3_SendCertificateVerify(sslSocket *ss
  
      isTLS = (PRBool)(ss->ssl3.pwSpec->version > SSL_LIBRARY_VERSION_3_0);
      isTLS12 = (PRBool)(ss->ssl3.pwSpec->version >= SSL_LIBRARY_VERSION_TLS_1_2);
 -    keyType = ss->ssl3.clientPrivateKey->keyType;
 -    rv = ssl3_SignHashes(&hashes, ss->ssl3.clientPrivateKey, &buf, isTLS);
 -    if (rv == SECSuccess) {
 -       PK11SlotInfo * slot;
 -       sslSessionID * sid   = ss->sec.ci.sid;
 +    if (ss->ssl3.platformClientKey) {
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
@@ skipping 33 matching lines @@
 +           PK11_FreeSlot(slot);
 +       }
 +       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
 +       ss->ssl3.clientPrivateKey = NULL;
      }
 -    SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
 -    ss->ssl3.clientPrivateKey = NULL;
      if (rv != SECSuccess) {
         goto done;      /* err code was set by ssl3_SignHashes */
      }
-@@ -5870,6 +5884,12 @@ ssl3_HandleServerHello(sslSocket *ss, SS
+@@ -6177,6 +6191,12 @@ ssl3_HandleServerHello(sslSocket *ss, SS
         SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
         ss->ssl3.clientPrivateKey = NULL;
      }
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    if (ss->ssl3.platformClientKey) {
 +       ssl_FreePlatformKey(ss->ssl3.platformClientKey);
 +       ss->ssl3.platformClientKey = (PlatformKey)NULL;
 +    }
 +#endif  /* NSS_PLATFORM_CLIENT_AUTH */
  
      temp = ssl3_ConsumeHandshakeNumber(ss, 2, &b, &length);
      if (temp < 0) {
-@@ -6496,6 +6516,10 @@ ssl3_HandleCertificateRequest(sslSocket
+@@ -6804,6 +6824,18 @@ ssl3_ExtractClientKeyInfo(sslSocket *ss,
+        goto done;
+     }
+ 
++#if defined(NSS_PLATFORM_CLIENT_AUTH) && defined(_WIN32)
++    /* If the key is in CAPI, assume conservatively that the CAPI service
++     * provider may be unable to sign SHA-256 hashes.
++     */
++    if (ss->ssl3.platformClientKey->dwKeySpec != CERT_NCRYPT_KEY_SPEC) {
++       /* CAPI only supports RSA and DSA signatures, so we don't need to
++        * check the key type. */
++       *preferSha1 = PR_TRUE;
++       goto done;
++    }
++#endif  /* NSS_PLATFORM_CLIENT_AUTH && _WIN32 */
++
+     /* If the key is a 1024-bit RSA or DSA key, assume conservatively that
+      * it may be unable to sign SHA-256 hashes. This is the case for older
+      * Estonian ID cards that have 1024-bit RSA keys. In FIPS 186-2 and
+@@ -6902,6 +6934,10 @@ ssl3_HandleCertificateRequest(sslSocket
      SECItem              cert_types  = {siBuffer, NULL, 0};
      SECItem              algorithms  = {siBuffer, NULL, 0};
      CERTDistNames        ca_list;
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    CERTCertList *       platform_cert_list = NULL;
 +    CERTCertListNode *   certNode = NULL;
 +#endif  /* NSS_PLATFORM_CLIENT_AUTH */
  
      SSL_TRC(3, ("%d: SSL3[%d]: handle certificate_request handshake",
                 SSL_GETPID(), ss->fd));
-@@ -6512,6 +6536,7 @@ ssl3_HandleCertificateRequest(sslSocket
+@@ -6918,6 +6954,7 @@ ssl3_HandleCertificateRequest(sslSocket
      PORT_Assert(ss->ssl3.clientCertChain == NULL);
      PORT_Assert(ss->ssl3.clientCertificate == NULL);
      PORT_Assert(ss->ssl3.clientPrivateKey == NULL);
 +    PORT_Assert(ss->ssl3.platformClientKey == (PlatformKey)NULL);
  
      isTLS = (PRBool)(ss->ssl3.prSpec->version > SSL_LIBRARY_VERSION_3_0);
      isTLS12 = (PRBool)(ss->ssl3.prSpec->version >= SSL_LIBRARY_VERSION_TLS_1_2);
-@@ -6591,6 +6616,18 @@ ssl3_HandleCertificateRequest(sslSocket
+@@ -6997,6 +7034,18 @@ ssl3_HandleCertificateRequest(sslSocket
      desc = no_certificate;
      ss->ssl3.hs.ws = wait_hello_done;
  
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    if (ss->getPlatformClientAuthData != NULL) {
 +       /* XXX Should pass cert_types and algorithms in this call!! */
 +        rv = (SECStatus)(*ss->getPlatformClientAuthData)(
 +                                        ss->getPlatformClientAuthDataArg,
 +                                        ss->fd, &ca_list,
 +                                        &platform_cert_list,
 +                                        (void**)&ss->ssl3.platformClientKey,
 +                                        &ss->ssl3.clientCertificate,
 +                                        &ss->ssl3.clientPrivateKey);
 +    } else
 +#endif
      if (ss->getClientAuthData != NULL) {
         /* XXX Should pass cert_types and algorithms in this call!! */
         rv = (SECStatus)(*ss->getClientAuthData)(ss->getClientAuthDataArg,
-@@ -6600,12 +6637,52 @@ ssl3_HandleCertificateRequest(sslSocket
+@@ -7006,12 +7055,55 @@ ssl3_HandleCertificateRequest(sslSocket
      } else {
         rv = SECFailure; /* force it to send a no_certificate alert */
      }
 +
      switch (rv) {
      case SECWouldBlock:        /* getClientAuthData has put up a dialog box. */
         ssl3_SetAlwaysBlock(ss);
         break;  /* not an error */
  
      case SECSuccess:
@@ skipping 26 matching lines @@
 +               if (ss->ssl3.clientCertificate != NULL) {
 +                   CERT_DestroyCertificate(ss->ssl3.clientCertificate);
 +                   ss->ssl3.clientCertificate = NULL;
 +               }
 +               if (ss->ssl3.platformClientKey) {
 +                   ssl_FreePlatformKey(ss->ssl3.platformClientKey);
 +                   ss->ssl3.platformClientKey = (PlatformKey)NULL;
 +               }
 +               goto send_no_certificate;
 +           }
++           if (ss->ssl3.hs.hashType == handshake_hash_single) {
++               ssl3_DestroyBackupHandshakeHashIfNotNeeded(ss, &algorithms);
++           }
 +           break;  /* not an error */
 +       }
 +#endif   /* NSS_PLATFORM_CLIENT_AUTH */
          /* check what the callback function returned */
          if ((!ss->ssl3.clientCertificate) || (!ss->ssl3.clientPrivateKey)) {
              /* we are missing either the key or cert */
-@@ -6668,6 +6745,10 @@ loser:
+@@ -7073,6 +7165,10 @@ loser:
  done:
      if (arena != NULL)
         PORT_FreeArena(arena, PR_FALSE);
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    if (platform_cert_list)
 +        CERT_DestroyCertList(platform_cert_list);
 +#endif
      return rv;
  }
  
-@@ -6749,7 +6830,8 @@ ssl3_SendClientSecondRound(sslSocket *ss
+@@ -7190,7 +7286,8 @@ ssl3_SendClientSecondRound(sslSocket *ss
  
      sendClientCert = !ss->ssl3.sendEmptyCert &&
                      ss->ssl3.clientCertChain  != NULL &&
 -                    ss->ssl3.clientPrivateKey != NULL;
 +                    (ss->ssl3.platformClientKey ||
 +                    ss->ssl3.clientPrivateKey != NULL);
  
-     /* We must wait for the server's certificate to be authenticated before
-      * sending the client certificate in order to disclosing the client
-@@ -11465,6 +11547,10 @@ ssl3_DestroySSL3Info(sslSocket *ss)
+     if (!sendClientCert &&
+        ss->ssl3.hs.hashType == handshake_hash_single &&
+@@ -12027,6 +12124,10 @@ ssl3_DestroySSL3Info(sslSocket *ss)
  
      if (ss->ssl3.clientPrivateKey != NULL)
         SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    if (ss->ssl3.platformClientKey)
 +       ssl_FreePlatformKey(ss->ssl3.platformClientKey);
 +#endif /* NSS_PLATFORM_CLIENT_AUTH */
  
      if (ss->ssl3.peerCertArena != NULL)
         ssl3_CleanupPeerCerts(ss);
 diff -pu a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c
---- a/nss/lib/ssl/ssl3ext.c     2013-07-31 12:07:10.964699464 -0700
-+++ b/nss/lib/ssl/ssl3ext.c     2013-07-31 12:35:27.189373289 -0700
+--- a/nss/lib/ssl/ssl3ext.c     2014-01-03 19:28:03.550814608 -0800
++++ b/nss/lib/ssl/ssl3ext.c     2014-01-03 19:30:52.653579045 -0800
 @@ -10,8 +10,8 @@
  #include "nssrenam.h"
  #include "nss.h"
  #include "ssl.h"
 -#include "sslproto.h"
  #include "sslimpl.h"
 +#include "sslproto.h"
  #include "pk11pub.h"
  #ifdef NO_PKCS11_BYPASS
  #include "blapit.h"
 diff -pu a/nss/lib/ssl/sslauth.c b/nss/lib/ssl/sslauth.c
---- a/nss/lib/ssl/sslauth.c     2013-07-31 12:32:29.076760372 -0700
-+++ b/nss/lib/ssl/sslauth.c     2013-07-31 12:35:27.189373289 -0700
-@@ -219,6 +219,28 @@ SSL_GetClientAuthDataHook(PRFileDesc *s,
+--- a/nss/lib/ssl/sslauth.c     2014-01-03 19:28:03.550814608 -0800
++++ b/nss/lib/ssl/sslauth.c     2014-01-03 19:30:52.653579045 -0800
+@@ -216,6 +216,28 @@ SSL_GetClientAuthDataHook(PRFileDesc *s,
      return SECSuccess;
  }
  
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +/* NEED LOCKS IN HERE.  */
 +SECStatus 
 +SSL_GetPlatformClientAuthDataHook(PRFileDesc *s,
 +                                  SSLGetPlatformClientAuthData func,
 +                                  void *arg)
 +{
 +    sslSocket *ss;
 +
 +    ss = ssl_FindSocket(s);
 +    if (!ss) {
 +       SSL_DBG(("%d: SSL[%d]: bad socket in GetPlatformClientAuthDataHook",
 +                SSL_GETPID(), s));
 +       return SECFailure;
 +    }
 +
 +    ss->getPlatformClientAuthData = func;
 +    ss->getPlatformClientAuthDataArg = arg;
 +    return SECSuccess;
 +}
 +#endif   /* NSS_PLATFORM_CLIENT_AUTH */
 +
  /* NEED LOCKS IN HERE.  */
  SECStatus 
  SSL_SetPKCS11PinArg(PRFileDesc *s, void *arg)
 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
---- a/nss/lib/ssl/ssl.h 2013-07-31 12:32:29.076760372 -0700
-+++ b/nss/lib/ssl/ssl.h 2013-07-31 12:35:27.199373436 -0700
+--- a/nss/lib/ssl/ssl.h 2014-01-03 19:28:03.540814444 -0800
++++ b/nss/lib/ssl/ssl.h 2014-01-03 19:30:52.653579045 -0800
 @@ -503,6 +503,48 @@ typedef SECStatus (PR_CALLBACK *SSLGetCl
  SSL_IMPORT SECStatus SSL_GetClientAuthDataHook(PRFileDesc *fd, 
                                                SSLGetClientAuthData f, void *a);
  
 +/*
 + * Prototype for SSL callback to get client auth data from the application,
 + * optionally using the underlying platform's cryptographic primitives.
 + * To use the platform cryptographic primitives, caNames and pRetCerts
 + * should be set.  To use NSS, pRetNSSCert and pRetNSSKey should be set.
 + * Returning SECFailure will cause the socket to send no client certificate.
@@ skipping 30 matching lines @@
 + *     f - the application's callback that delivers the key and cert
 + *     a - application specific data
 + */
 +SSL_IMPORT SECStatus
 +SSL_GetPlatformClientAuthDataHook(PRFileDesc *fd,
 +                                  SSLGetPlatformClientAuthData f, void *a);
  
  /*
  ** SNI extension processing callback function.
 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h     2013-07-31 12:31:45.326118409 -0700
-+++ b/nss/lib/ssl/sslimpl.h     2013-07-31 12:35:27.199373436 -0700
+--- a/nss/lib/ssl/sslimpl.h     2014-01-03 19:30:40.073373382 -0800
++++ b/nss/lib/ssl/sslimpl.h     2014-01-03 19:30:52.653579045 -0800
 @@ -20,6 +20,7 @@
  #include "sslerr.h"
  #include "ssl3prot.h"
  #include "hasht.h"
 +#include "keythi.h"
  #include "nssilock.h"
  #include "pkcs11t.h"
  #if defined(XP_UNIX) || defined(XP_BEOS)
 @@ -31,6 +32,15 @@
  
  #include "sslt.h" /* for some formerly private types, now public */
  
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +#if defined(XP_WIN32)
 +#include <windows.h>
 +#include <wincrypt.h>
 +#elif defined(XP_MACOSX)
 +#include <Security/Security.h>
 +#endif
 +#endif
 +
  /* to make some of these old enums public without namespace pollution,
  ** it was necessary to prepend ssl_ to the names.
  ** These #defines preserve compatibility with the old code here in libssl.
-@@ -444,6 +454,14 @@ typedef SECStatus (*SSLCompressor)(void
-                                    int                  inlen);
- typedef SECStatus (*SSLDestroy)(void *context, PRBool freeit);
+@@ -432,6 +442,14 @@ struct sslGatherStr {
+ #define GS_DATA                3
+ #define GS_PAD         4
  
 +#if defined(NSS_PLATFORM_CLIENT_AUTH) && defined(XP_WIN32)
 +typedef PCERT_KEY_CONTEXT PlatformKey;
 +#elif defined(NSS_PLATFORM_CLIENT_AUTH) && defined(XP_MACOSX)
 +typedef SecKeyRef PlatformKey;
 +#else
 +typedef void *PlatformKey;
 +#endif
 +
  
  
  /*
-@@ -896,6 +914,10 @@ struct ssl3StateStr {
+@@ -944,6 +962,10 @@ struct ssl3StateStr {
  
      CERTCertificate *    clientCertificate;  /* used by client */
      SECKEYPrivateKey *   clientPrivateKey;   /* used by client */
 +    /* platformClientKey is present even when NSS_PLATFORM_CLIENT_AUTH is not
 +     * defined in order to allow cleaner conditional code.
 +     * At most one of clientPrivateKey and platformClientKey may be set. */
 +    PlatformKey          platformClientKey;  /* used by client */
      CERTCertificateList *clientCertChain;    /* used by client */
      PRBool               sendEmptyCert;      /* used by client */
  
-@@ -1153,6 +1175,10 @@ const unsigned char *  preferredCipher;
+@@ -1205,6 +1227,10 @@ const unsigned char *  preferredCipher;
      void                     *authCertificateArg;
      SSLGetClientAuthData      getClientAuthData;
      void                     *getClientAuthDataArg;
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    SSLGetPlatformClientAuthData getPlatformClientAuthData;
 +    void                        *getPlatformClientAuthDataArg;
 +#endif  /* NSS_PLATFORM_CLIENT_AUTH */
      SSLSNISocketConfig        sniSocketConfig;
      void                     *sniSocketConfigArg;
      SSLBadCertHandler         handleBadCert;
-@@ -1737,7 +1763,6 @@ extern void ssl_FreePRSocket(PRFileDesc
-  * various ciphers */
- extern int ssl3_config_match_init(sslSocket *);
- 
--
- /* Create a new ref counted key pair object from two keys. */
- extern ssl3KeyPair * ssl3_NewKeyPair( SECKEYPrivateKey * privKey, 
-                                       SECKEYPublicKey * pubKey);
-@@ -1777,6 +1802,26 @@ extern SECStatus ssl_InitSessionCacheLoc
+@@ -1843,6 +1869,26 @@ extern SECStatus ssl_InitSessionCacheLoc
  
  extern SECStatus ssl_FreeSessionCacheLocks(void);
  
 +/***************** platform client auth ****************/
 +
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +// Releases the platform key.
 +extern void ssl_FreePlatformKey(PlatformKey key);
 +
 +// Implement the client CertificateVerify message for SSL3/TLS1.0
 +extern SECStatus ssl3_PlatformSignHashes(SSL3Hashes *hash,
 +                                         PlatformKey key, SECItem *buf,
 +                                         PRBool isTLS, KeyType keyType);
 +
 +// Converts a CERTCertList* (A collection of CERTCertificates) into a
 +// CERTCertificateList* (A collection of SECItems), or returns NULL if
 +// it cannot be converted.
 +// This is to allow the platform-supplied chain to be created with purely
 +// public API functions, using the preferred CERTCertList mutators, rather
 +// pushing this hack to clients.
 +extern CERTCertificateList* hack_NewCertificateListFromCertList(
 +        CERTCertList* list);
 +#endif  /* NSS_PLATFORM_CLIENT_AUTH */
  
  /**************** DTLS-specific functions **************/
  extern void dtls_FreeQueuedMessage(DTLSQueuedMessage *msg);
 diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
---- a/nss/lib/ssl/sslsock.c     2013-07-31 12:28:39.283413269 -0700
-+++ b/nss/lib/ssl/sslsock.c     2013-07-31 12:35:27.199373436 -0700
-@@ -343,6 +343,10 @@ ssl_DupSocket(sslSocket *os)
+--- a/nss/lib/ssl/sslsock.c     2014-01-03 19:28:03.560814773 -0800
++++ b/nss/lib/ssl/sslsock.c     2014-01-03 19:30:52.653579045 -0800
+@@ -261,6 +261,10 @@ ssl_DupSocket(sslSocket *os)
             ss->authCertificateArg    = os->authCertificateArg;
             ss->getClientAuthData     = os->getClientAuthData;
             ss->getClientAuthDataArg  = os->getClientAuthDataArg;
 +#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;
-@@ -1730,6 +1734,12 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile
+@@ -1645,6 +1649,12 @@ SSL_ReconfigFD(PRFileDesc *model, PRFile
          ss->getClientAuthData     = sm->getClientAuthData;
      if (sm->getClientAuthDataArg)
          ss->getClientAuthDataArg  = sm->getClientAuthDataArg;
 +#ifdef NSS_PLATFORM_CLIENT_AUTH
 +    if (sm->getPlatformClientAuthData)
 +        ss->getPlatformClientAuthData    = sm->getPlatformClientAuthData;
 +    if (sm->getPlatformClientAuthDataArg)
 +        ss->getPlatformClientAuthDataArg = sm->getPlatformClientAuthDataArg;
 +#endif
      if (sm->sniSocketConfig)
          ss->sniSocketConfig       = sm->sniSocketConfig;
      if (sm->sniSocketConfigArg)
-@@ -2980,6 +2990,10 @@ ssl_NewSocket(PRBool makeLocks, SSLProto
+@@ -2899,6 +2909,10 @@ ssl_NewSocket(PRBool makeLocks, SSLProto
          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;