Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/ssl/sslsecur.c

 /*
  * Various SSL functions.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "cert.h"
 #include "secitem.h"
 #include "keyhi.h"
 #include "ssl.h"
@@ skipping 259 matching lines @@
         return SECFailure;
     }
 
     if (!ss->opt.useSecurity)
         return SECSuccess;
     
     ssl_Get1stHandshakeLock(ss);
 
     /* 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);
         rv = ssl3_RedoHandshake(ss, flushCache); /* force full handshake. */
         ssl_ReleaseSSL3HandshakeLock(ss);
     }
 
     ssl_Release1stHandshakeLock(ss);
 
     return rv;
@@ skipping 939 matching lines @@
 ssl_SecureRead(sslSocket *ss, unsigned char *buf, int len)
 {
     return ssl_SecureRecv(ss, buf, len, 0);
 }
 
 /* Caller holds the SSL Socket's write lock. SSL_LOCK_WRITER(ss) */
 int
 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));
 
     if (ss->shutdownHow & ssl_SHUTDOWN_SEND) {
         PORT_SetError(PR_SOCKET_SHUTDOWN_ERROR);
         rv = PR_FAILURE;
         goto done;
     }
     if (flags) {
@@ skipping 14 matching lines @@
     }
     ssl_ReleaseXmitBufLock(ss);
     if (rv < 0) {
         goto done;
     }
 
     if (len > 0) 
         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) {
             ssl_GetSSL3HandshakeLock(ss);
             falseStart = ss->ssl3.hs.canFalseStart;
             ssl_ReleaseSSL3HandshakeLock(ss);
         }
         if (!falseStart &&
             (ss->handshake || ss->nextHandshake || ss->securityHandshake)) {
             rv = ssl_Do1stHandshake(ss);
@@ skipping 106 matching lines @@
 
     return rv;
 }
 
 /*
  * Allow the application to pass the set of trust anchors
  */
 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;
 
     if (!certList) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetTrustAnchors",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     names = CERT_DistNamesFromCertList(certList);
     if (names == NULL) {
         return SECFailure;
     }
     ssl_Get1stHandshakeLock(ss);
     ssl_GetSSL3HandshakeLock(ss);
     if (ss->ssl3.ca_list) {
         CERT_FreeDistNames(ss->ssl3.ca_list);
     }
     ss->ssl3.ca_list = names;
     ssl_ReleaseSSL3HandshakeLock(ss);
     ssl_Release1stHandshakeLock(ss);
 
     return SECSuccess;
-#endif
 }
 
 /*
 ** Returns Negative number on error, zero or greater on success.
 ** Returns the amount of data immediately available to be read.
 */
 int
 SSL_DataPending(PRFileDesc *fd)
 {
     sslSocket *ss;
@@ skipping 276 matching lines @@
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SNISocketConfigHook",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     ss->sniSocketConfig = func;
     ss->sniSocketConfigArg = arg;
     return SECSuccess;
 }