Use NSSRWLock instead of PRRWLock in sslSessionID. This avoids the bugs

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 120 matching lines @@
             SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
         }
         if (sid->u.ssl3.originalHandshakeHash.data) {
             SECITEM_FreeItem(&sid->u.ssl3.originalHandshakeHash, PR_FALSE);
         }
         if (sid->u.ssl3.signedCertTimestamps.data) {
             SECITEM_FreeItem(&sid->u.ssl3.signedCertTimestamps, PR_FALSE);
         }
 
         if (sid->u.ssl3.lock) {
-            PR_DestroyRWLock(sid->u.ssl3.lock);
+            NSSRWLock_Destroy(sid->u.ssl3.lock);
         }
     }
 
     if (sid->peerID != NULL)
         PORT_Free((void *)sid->peerID);         /* CONST */
 
     if (sid->urlSvrName != NULL)
         PORT_Free((void *)sid->urlSvrName);     /* CONST */
 
     if ( sid->peerCert ) {
@@ skipping 155 matching lines @@
             rv = PK11_GenerateRandom(sid->u.ssl3.sessionID,
                 SSL3_SESSIONID_BYTES);
             if (rv != SECSuccess)
                 return;
             sid->u.ssl3.sessionIDLength = SSL3_SESSIONID_BYTES;
         }
         expirationPeriod = ssl3_sid_timeout;
         PRINT_BUF(8, (0, "sessionID:",
                       sid->u.ssl3.sessionID, sid->u.ssl3.sessionIDLength));
 
-        sid->u.ssl3.lock = PR_NewRWLock(PR_RWLOCK_RANK_NONE, NULL);
+        sid->u.ssl3.lock = NSSRWLock_New(NSS_RWLOCK_RANK_NONE, NULL);
         if (!sid->u.ssl3.lock) {
             return;
         }
     }
     PORT_Assert(sid->creationTime != 0 && sid->expirationTime != 0);
     if (!sid->creationTime)
         sid->lastAccessTime = sid->creationTime = ssl_Time();
     if (!sid->expirationTime)
         sid->expirationTime = sid->creationTime + expirationPeriod;
 
@@ skipping 119 matching lines @@
 {
     PORT_Assert(sid);
     PORT_Assert(newSessionTicket);
 
     /* if sid->u.ssl3.lock, we are updating an existing entry that is already
      * cached or was once cached, so we need to acquire and release the write
      * lock. Otherwise, this is a new session that isn't shared with anything
      * yet, so no locking is needed.
      */
     if (sid->u.ssl3.lock) {
-        PR_RWLock_Wlock(sid->u.ssl3.lock);
+        NSSRWLock_LockWrite(sid->u.ssl3.lock);
 
         /* A server might have sent us an empty ticket, which has the
          * effect of clearing the previously known ticket.
          */
         if (sid->u.ssl3.locked.sessionTicket.ticket.data) {
             SECITEM_FreeItem(&sid->u.ssl3.locked.sessionTicket.ticket,
                              PR_FALSE);
         }
     }
 
     PORT_Assert(!sid->u.ssl3.locked.sessionTicket.ticket.data);
 
     /* 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) {
-        PR_RWLock_Unlock(sid->u.ssl3.lock);
+        NSSRWLock_UnlockWrite(sid->u.ssl3.lock);
     }
 }