Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/ssl/sslsecur.c

Index: net/third_party/nss/ssl/sslsecur.c
===================================================================
--- net/third_party/nss/ssl/sslsecur.c	(revision 242942)
+++ net/third_party/nss/ssl/sslsecur.c	(working copy)
@@ -277,7 +277,7 @@
 
     /* SSL v2 protocol does not support subsequent handshakes. */
     if (ss->version < SSL_LIBRARY_VERSION_3_0) {
-	PORT_SetError(SEC_ERROR_INVALID_ARGS);
+	PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2);
 	rv = SECFailure;
     } else {
 	ssl_GetSSL3HandshakeLock(ss);
@@ -1237,7 +1237,6 @@
 ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags)
 {
     int rv = 0;
-    PRBool falseStart = PR_FALSE;
 
     SSL_TRC(2, ("%d: SSL[%d]: SecureSend: sending %d bytes",
 		SSL_GETPID(), ss->fd, len));
@@ -1272,6 +1271,7 @@
     	ss->writerThread = PR_GetCurrentThread();
     /* If any of these is non-zero, the initial handshake is not done. */
     if (!ss->firstHsDone) {
+	PRBool falseStart = PR_FALSE;
 	ssl_Get1stHandshakeLock(ss);
 	if (ss->opt.enableFalseStart &&
 	    ss->version >= SSL_LIBRARY_VERSION_3_0) {
@@ -1398,10 +1398,6 @@
 SECStatus
 SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *certList)
 {
-    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
-    PR_NOT_REACHED("not implemented");
-    return SECFailure;
-#if 0
     sslSocket *   ss = ssl_FindSocket(fd);
     CERTDistNames *names = NULL;
 
@@ -1429,7 +1425,6 @@
     ssl_Release1stHandshakeLock(ss);
 
     return SECSuccess;
-#endif
 }
 
 /*