Update net/third_party/nss to NSS 3.15.4.

net/third_party/nss/ssl/sslcon.c

 /* 
  * SSL v2 handshake functions, and functions common to SSL2 and SSL3.
  *
  * 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 "nssrenam.h"
 #include "cert.h"
 #include "secitem.h"
 #include "sechash.h"
 #include "cryptohi.h"           /* for SGN_ funcs */
 #include "keyhi.h"              /* for SECKEY_ high level functions. */
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "ssl3prot.h"
 #include "sslerr.h"
 #include "pk11func.h"
 #include "prinit.h"
 #include "prtime.h"     /* for PR_Now() */
 
-#define XXX
 static PRBool policyWasSet;
 
 /* This ordered list is indexed by (SSL_CK_xx * 3)   */
 /* Second and third bytes are MSB and LSB of master key length. */
 static const PRUint8 allCipherSuites[] = {
     0,                                          0,    0,
     SSL_CK_RC4_128_WITH_MD5,                    0x00, 0x80,
     SSL_CK_RC4_128_EXPORT40_WITH_MD5,           0x00, 0x80,
     SSL_CK_RC2_128_CBC_WITH_MD5,                0x00, 0x80,
     SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5,       0x00, 0x80,
@@ skipping 587 matching lines @@
 
         DUMP_MSG(29, (ss, msg, sendLen));
         sent = (*ss->sec.send)(ss, msg, sendLen, 0);
 
         if (sent < 0) {
             /* If send failed, it is now a bogus  session-id */
             if (ss->sec.uncache)
                 (*ss->sec.uncache)(sid);
             rv = (SECStatus)sent;
         } else if (!ss->opt.noCache) {
-            /* Put the sid in session-id cache, (may already be there) */
-            (*ss->sec.cache)(sid);
+            if (sid->cached == never_cached) {
+                (*ss->sec.cache)(sid);
+            }
             rv = SECSuccess;
         }
         ssl_FreeSID(sid);
         ss->sec.ci.sid = 0;
     }
 done:
     ssl_ReleaseXmitBufLock(ss);    /***************************************/
     return rv;
 }
 
@@ skipping 1521 matching lines @@
 ssl2_ClientRegSessionID(sslSocket *ss, PRUint8 *s)
 {
     sslSessionID *sid = ss->sec.ci.sid;
 
     /* Record entry in nonce cache */
     if (sid->peerCert == NULL) {
         PORT_Memcpy(sid->u.ssl2.sessionID, s, sizeof(sid->u.ssl2.sessionID));
         sid->peerCert = CERT_DupCertificate(ss->sec.peerCert);
 
     }
-    if (!ss->opt.noCache)
+    if (!ss->opt.noCache && sid->cached == never_cached)
         (*ss->sec.cache)(sid);
 }
 
 /* Called from ssl2_HandleMessage() */
 static SECStatus
 ssl2_TriggerNextMessage(sslSocket *ss)
 {
     SECStatus        rv;
 
     PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) );
@@ skipping 1502 matching lines @@
 
     c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; 
     return NSS_VersionCheck(importedVersion);
 }
 
 const char *
 NSSSSL_GetVersion(void)
 {
     return NSS_VERSION;
 }