Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/patches/restartclientauth.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:44:31.987362835 -0700
-+++ b/nss/lib/ssl/ssl3con.c     2013-07-31 12:44:50.987642452 -0700
-@@ -6756,6 +6756,85 @@ done:
+--- a/nss/lib/ssl/ssl3con.c     2014-01-03 19:32:06.914793097 -0800
++++ b/nss/lib/ssl/ssl3con.c     2014-01-03 19:35:08.237757576 -0800
+@@ -7176,6 +7176,85 @@ done:
      return rv;
  }
  
 +/*
 + * attempt to restart the handshake after asynchronously handling
 + * a request for the client's certificate.
 + *
 + * inputs:
 + *     cert    Client cert chosen by application.
 + *             Note: ssl takes this reference, and does not bump the
@@ skipping 62 matching lines @@
 +       }
 +       if (certChain) {
 +           CERT_DestroyCertificateList(certChain);
 +       }
 +       PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
 +       rv = SECFailure;
 +    }
 +    return rv;
 +}
 +
- PRBool
- ssl3_CanFalseStart(sslSocket *ss) {
-     PRBool rv;
+ static SECStatus
+ ssl3_CheckFalseStart(sslSocket *ss)
+ {
 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
---- a/nss/lib/ssl/ssl.h 2013-07-31 12:44:31.987362835 -0700
-+++ b/nss/lib/ssl/ssl.h 2013-07-31 12:44:50.987642452 -0700
-@@ -366,6 +366,11 @@ SSL_IMPORT SECStatus SSL_ForceHandshake(
+--- a/nss/lib/ssl/ssl.h 2014-01-03 19:32:06.914793097 -0800
++++ b/nss/lib/ssl/ssl.h 2014-01-03 19:32:19.164993372 -0800
+@@ -369,6 +369,11 @@ SSL_IMPORT SECStatus SSL_ForceHandshake(
  SSL_IMPORT SECStatus SSL_ForceHandshakeWithTimeout(PRFileDesc *fd,
                                                     PRIntervalTime timeout);
  
 +SSL_IMPORT SECStatus SSL_RestartHandshakeAfterCertReq(PRFileDesc *fd,
 +                                           CERTCertificate *cert,
 +                                           SECKEYPrivateKey *key,
 +                                           CERTCertificateList *certChain);
 +
  /*
  ** Query security status of socket. *on is set to one if security is
  ** enabled. *keySize will contain the stream key size used. *issuer will
 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h     2013-07-31 12:44:31.997362988 -0700
-+++ b/nss/lib/ssl/sslimpl.h     2013-07-31 12:44:50.987642452 -0700
-@@ -1513,16 +1513,17 @@ extern  SECStatus ssl3_MasterKeyDeriveBy
+--- a/nss/lib/ssl/sslimpl.h     2014-01-03 19:32:06.914793097 -0800
++++ b/nss/lib/ssl/sslimpl.h     2014-01-03 19:32:19.164993372 -0800
+@@ -1579,16 +1579,17 @@ extern  SECStatus ssl3_MasterKeyDeriveBy
  /* These functions are called from secnav, even though they're "private". */
  
  extern int ssl2_SendErrorMessage(struct sslSocketStr *ss, int error);
 -extern int SSL_RestartHandshakeAfterCertReq(struct sslSocketStr *ss,
 -                                           CERTCertificate *cert,
 -                                           SECKEYPrivateKey *key,
 -                                           CERTCertificateList *certChain);
  extern sslSocket *ssl_FindSocket(PRFileDesc *fd);
  extern void ssl_FreeSocket(struct sslSocketStr *ssl);
  extern SECStatus SSL3_SendAlert(sslSocket *ss, SSL3AlertLevel level,
                                 SSL3AlertDescription desc);
  extern SECStatus ssl3_DecodeError(sslSocket *ss);
  
 +extern SECStatus ssl3_RestartHandshakeAfterCertReq(sslSocket *    ss,
 +                                            CERTCertificate *    cert, 
 +                                            SECKEYPrivateKey *   key,
 +                                            CERTCertificateList *certChain);
 +
  extern SECStatus ssl3_AuthCertificateComplete(sslSocket *ss, PRErrorCode error);
  
  /*
 diff -pu a/nss/lib/ssl/sslsecur.c b/nss/lib/ssl/sslsecur.c
---- a/nss/lib/ssl/sslsecur.c    2013-07-31 12:28:39.283413269 -0700
-+++ b/nss/lib/ssl/sslsecur.c    2013-07-31 12:44:50.987642452 -0700
-@@ -1436,17 +1436,70 @@ SSL_CertDBHandleSet(PRFileDesc *fd, CERT
+--- a/nss/lib/ssl/sslsecur.c    2014-01-03 19:28:03.560814773 -0800
++++ b/nss/lib/ssl/sslsecur.c    2014-01-03 19:32:19.174993536 -0800
+@@ -1518,17 +1518,70 @@ SSL_CertDBHandleSet(PRFileDesc *fd, CERT
      return SECSuccess;
  }
  
 -/* DO NOT USE. This function was exported in ssl.def with the wrong signature;
 - * this implementation exists to maintain link-time compatibility.
 +/*
 + * attempt to restart the handshake after asynchronously handling
 + * a request for the client's certificate.
 + *
 + * inputs:  
@@ skipping 56 matching lines @@
 +       }
 +       PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2);
 +       ret = SECFailure;
 +    }
 +
 +    ssl_Release1stHandshakeLock(ss);  /************************************/
 +    return ret;
  }
  
  /* DO NOT USE. This function was exported in ssl.def with the wrong signature;