Update NSS libSSL to NSS_3_15_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/. */
-/* $Id: sslnonce.c,v 1.27 2012/04/25 14:50:12 gerv%gerv.net Exp $ */
+/* $Id$ */
 
 #include "cert.h"
 #include "pk11pub.h"
 #include "secitem.h"
 #include "ssl.h"
 #include "nss.h"
 
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "nssilock.h"
-#if (defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)) && !defined(_WIN32_WCE)
+#if defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)
 #include <time.h>
 #endif
 
 PRUint32 ssl_sid_timeout = 100;
 PRUint32 ssl3_sid_timeout = 86400L; /* 24 hours */
 
 static sslSessionID *cache = NULL;
 static PZLock *      cacheLock = NULL;
 
 /* sids can be in one of 4 states:
@@ skipping 152 matching lines @@
 
     if (sid->urlSvrName != NULL)
         PORT_Free((void *)sid->urlSvrName);     /* CONST */
 
     if ( sid->peerCert ) {
         CERT_DestroyCertificate(sid->peerCert);
     }
     for (i = 0; i < MAX_PEER_CERT_CHAIN_SIZE && sid->peerCertChain[i]; i++) {
         CERT_DestroyCertificate(sid->peerCertChain[i]);
     }
+    if (sid->peerCertStatus.len) {
+        SECITEM_FreeArray(&sid->peerCertStatus, PR_FALSE);
+        sid->peerCertStatus.items = NULL;
+        sid->peerCertStatus.len = 0;
+    }
+
     if ( sid->localCert ) {
         CERT_DestroyCertificate(sid->localCert);
     }
     if (sid->u.ssl3.sessionTicket.ticket.data) {
         SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE);
     }
     if (sid->u.ssl3.srvName.data) {
         SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
     }
     
@@ skipping 248 matching lines @@
     while(cache != NULL)
         UncacheSID(cache);
     UNLOCK_CACHE;
 }
 
 /* returns an unsigned int containing the number of seconds in PR_Now() */
 PRUint32
 ssl_Time(void)
 {
     PRUint32 myTime;
-#if (defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)) && !defined(_WIN32_WCE)
+#if defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)
     myTime = time(NULL);        /* accurate until the year 2038. */
 #else
     /* portable, but possibly slower */
     PRTime now;
     PRInt64 ll;
 
     now = PR_Now();
     LL_I2L(ll, 1000000L);
     LL_DIV(now, now, ll);
     LL_L2UI(myTime, now);
@@ skipping 26 matching lines @@
         sid->u.ssl3.sessionTicket.ticket.len = 0;
     }
     sid->u.ssl3.sessionTicket.received_timestamp =
         session_ticket->received_timestamp;
     sid->u.ssl3.sessionTicket.ticket_lifetime_hint =
         session_ticket->ticket_lifetime_hint;
 
     UNLOCK_CACHE;
     return SECSuccess;
 }