Update net/third_party/nss to NSS_3_15_5_BETA2.

net/third_party/nss/ssl/sslnonce.c

 /* 
  * This file implements the CLIENT Session ID cache.  
  *
  * 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 "pk11pub.h"
 #include "secitem.h"
@@ skipping 96 matching lines @@
 }
 
 /* BEWARE: This function gets called for both client and server SIDs !!
  * If the unreferenced sid is not in the cache, Free sid and its contents.
  */
 static void
 ssl_DestroySID(sslSessionID *sid)
 {
     int i;
     SSL_TRC(8, ("SSL: destroy sid: sid=0x%x cached=%d", sid, sid->cached));
-    PORT_Assert((sid->references == 0));
-
-    if (sid->cached == in_client_cache)
-        return; /* it will get taken care of next time cache is traversed. */
+    PORT_Assert(sid->references == 0);
+    PORT_Assert(sid->cached != in_client_cache);
 
     if (sid->version < SSL_LIBRARY_VERSION_3_0) {
         SECITEM_ZfreeItem(&sid->u.ssl2.masterKey, PR_FALSE);
         SECITEM_ZfreeItem(&sid->u.ssl2.cipherArg, PR_FALSE);
     } else {
         if (sid->u.ssl3.locked.sessionTicket.ticket.data) {
             SECITEM_FreeItem(&sid->u.ssl3.locked.sessionTicket.ticket,
                              PR_FALSE);
         }
         if (sid->u.ssl3.srvName.data) {
@@ skipping 84 matching lines @@
         return NULL;
     now = ssl_Time();
     LOCK_CACHE;
     sidp = &cache;
     while ((sid = *sidp) != 0) {
         PORT_Assert(sid->cached == in_client_cache);
         PORT_Assert(sid->references >= 1);
 
         SSL_TRC(8, ("SSL: Lookup1: sid=0x%x", sid));
 
-        if (sid->expirationTime < now || !sid->references) {
+        if (sid->expirationTime < now) {
             /*
-            ** This session-id timed out, or was orphaned.
+            ** This session-id timed out.
             ** Don't even care who it belongs to, blow it out of our cache.
             */
             SSL_TRC(7, ("SSL: lookup1, throwing sid out, age=%d refs=%d",
                         now - sid->creationTime, sid->references));
 
             *sidp = sid->next;                  /* delink it from the list. */
             sid->cached = invalid_cache;        /* mark not on list. */
-            if (!sid->references)
-                ssl_DestroySID(sid);
-            else
-                ssl_FreeLockedSID(sid);         /* drop ref count, free. */
-
+            ssl_FreeLockedSID(sid);             /* drop ref count, free. */
         } else if (!memcmp(&sid->addr, addr, sizeof(PRIPv6Addr)) && /* server IP addr matches */
                    (sid->port == port) && /* server port matches */
                    /* proxy (peerID) matches */
                    (((peerID == NULL) && (sid->peerID == NULL)) ||
                     ((peerID != NULL) && (sid->peerID != NULL) &&
                      PORT_Strcmp(sid->peerID, peerID) == 0)) &&
                    /* is cacheable */
                    (sid->version < SSL_LIBRARY_VERSION_3_0 ||
                     sid->u.ssl3.keys.resumable) &&
                    /* server hostname matches. */
@@ skipping 219 matching lines @@
 
     /* Do a shallow copy, moving the ticket data. */
     sid->u.ssl3.locked.sessionTicket = *newSessionTicket;
     newSessionTicket->ticket.data = NULL;
     newSessionTicket->ticket.len = 0;
 
     if (sid->u.ssl3.lock) {
         NSSRWLock_UnlockWrite(sid->u.ssl3.lock);
     }
 }