Update net/third_party/nss to NSS_3_15_5_BETA2.

net/third_party/nss/patches/cachelocks.patch

 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c     2014-01-03 19:02:30.135754914 -0800
-+++ b/nss/lib/ssl/ssl3con.c     2014-01-03 19:03:07.266361523 -0800
-@@ -5655,7 +5655,6 @@ SSL3_ShutdownServerCache(void)
+--- a/nss/lib/ssl/ssl3con.c     2014-01-17 18:10:16.783281701 -0800
++++ b/nss/lib/ssl/ssl3con.c     2014-01-17 18:11:03.734060469 -0800
+@@ -5678,7 +5678,6 @@ SSL3_ShutdownServerCache(void)
      }
  
      PZ_Unlock(symWrapKeysLock);
 -    ssl_FreeSessionCacheLocks();
      return SECSuccess;
  }
  
-@@ -5707,7 +5706,7 @@ getWrappingKey( sslSocket *       ss,
+@@ -5730,7 +5729,7 @@ getWrappingKey( sslSocket *       ss,
  
      pSymWrapKey = &symWrapKeys[symWrapMechIndex].symWrapKey[exchKeyType];
  
 -    ssl_InitSessionCacheLocks(PR_TRUE);
 +    ssl_InitSessionCacheLocks();
  
      PZ_Lock(symWrapKeysLock);
  
 diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h
---- a/nss/lib/ssl/sslimpl.h     2014-01-03 19:02:30.135754914 -0800
-+++ b/nss/lib/ssl/sslimpl.h     2014-01-03 19:03:07.266361523 -0800
-@@ -1904,9 +1904,7 @@ extern SECStatus ssl_InitSymWrapKeysLock
+--- a/nss/lib/ssl/sslimpl.h     2014-01-17 18:10:16.793281867 -0800
++++ b/nss/lib/ssl/sslimpl.h     2014-01-17 18:11:03.734060469 -0800
+@@ -1913,9 +1913,7 @@ extern SECStatus ssl_InitSymWrapKeysLock
  
  extern SECStatus ssl_FreeSymWrapKeysLock(void);
  
 -extern SECStatus ssl_InitSessionCacheLocks(PRBool lazyInit);
 -
 -extern SECStatus ssl_FreeSessionCacheLocks(void);
 +extern SECStatus ssl_InitSessionCacheLocks(void);
  
  /***************** platform client auth ****************/
  
 diff -pu a/nss/lib/ssl/sslnonce.c b/nss/lib/ssl/sslnonce.c
---- a/nss/lib/ssl/sslnonce.c    2014-01-03 18:54:48.638219358 -0800
-+++ b/nss/lib/ssl/sslnonce.c    2014-01-03 19:03:07.276361687 -0800
+--- a/nss/lib/ssl/sslnonce.c    2014-01-17 17:59:03.242109996 -0800
++++ b/nss/lib/ssl/sslnonce.c    2014-01-17 18:11:03.754060801 -0800
 @@ -35,91 +35,55 @@ static PZLock *      cacheLock = NULL;
  #define LOCK_CACHE     lock_cache()
  #define UNLOCK_CACHE   PZ_Unlock(cacheLock)
  
 -static SECStatus
 -ssl_InitClientSessionCacheLock(void)
 -{
 -    cacheLock = PZ_NewLock(nssILockCache);
 -    return cacheLock ? SECSuccess : SECFailure;
 -}
@@ skipping 147 matching lines @@
 -static void 
 +static void
  lock_cache(void)
  {
 -    ssl_InitSessionCacheLocks(PR_TRUE);
 +    ssl_InitSessionCacheLocks();
      PZ_Lock(cacheLock);
  }
  
 diff -pu a/nss/lib/ssl/sslsnce.c b/nss/lib/ssl/sslsnce.c
---- a/nss/lib/ssl/sslsnce.c     2014-01-03 18:38:48.402575652 -0800
-+++ b/nss/lib/ssl/sslsnce.c     2014-01-03 19:03:07.276361687 -0800
+--- a/nss/lib/ssl/sslsnce.c     2014-01-17 17:49:26.072517368 -0800
++++ b/nss/lib/ssl/sslsnce.c     2014-01-17 18:11:03.774061133 -0800
 @@ -1353,7 +1353,7 @@ SSL_ConfigServerSessionIDCache(   int
                                 PRUint32 ssl3_timeout, 
                           const char *   directory)
  {
 -    ssl_InitSessionCacheLocks(PR_FALSE);
 +    ssl_InitSessionCacheLocks();
      return SSL_ConfigServerSessionIDCacheInstance(&globalCache, 
                 maxCacheEntries, ssl2_timeout, ssl3_timeout, directory, PR_FALSE);
  }
 @@ -1467,7 +1467,7 @@ SSL_ConfigServerSessionIDCacheWithOpt(
                                  PRBool enableMPCache)
  {
      if (!enableMPCache) {
 -        ssl_InitSessionCacheLocks(PR_FALSE);
 +        ssl_InitSessionCacheLocks();
          return ssl_ConfigServerSessionIDCacheInstanceWithOpt(&globalCache, 
             ssl2_timeout, ssl3_timeout, directory, PR_FALSE,
             maxCacheEntries, maxCertCacheEntries, maxSrvNameCacheEntries);
 @@ -1512,7 +1512,7 @@ SSL_InheritMPServerSIDCacheInstance(cach
         return SECSuccess;      /* already done. */
      }
  
 -    ssl_InitSessionCacheLocks(PR_FALSE);
 +    ssl_InitSessionCacheLocks();
  
      ssl_sid_lookup  = ServerSessionIDLookup;
      ssl_sid_cache   = ServerSessionIDCache;