Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/ckfw/hash.c

 /* 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/. */
 
 /*
  * hash.c
  *
  * This is merely a couple wrappers around NSPR's PLHashTable, using
  * the identity hash and arena-aware allocators.  The reason I did
  * this is that hash tables are used in a few places throughout the
@@ skipping 30 matching lines @@
   PLHashTable *plHashTable;
   CK_ULONG count;
 };
 
 static PLHashNumber
 nss_ckfw_identity_hash
 (
   const void *key
 )
 {
-  PRUint32 i = (PRUint32)key;
-  PR_ASSERT(sizeof(PLHashNumber) == sizeof(PRUint32));
-  return (PLHashNumber)i;
+  return (PLHashNumber)((char *)key - (char *)NULL);
 }
 
 /*
  * nssCKFWHash_Create
  *
  */
 NSS_IMPLEMENT nssCKFWHash *
 nssCKFWHash_Create
 (
   NSSCKFWInstance *fwInstance,
@@ skipping 16 matching lines @@
 
   rv = nss_ZNEW(arena, nssCKFWHash);
   if (!rv) {
     *pError = CKR_HOST_MEMORY;
     return (nssCKFWHash *)NULL;
   }
 
   rv->mutex = nssCKFWInstance_CreateMutex(fwInstance, arena, pError);
   if (!rv->mutex) {
     if( CKR_OK == *pError ) {
-      (void)nss_ZFreeIf(rv);
       *pError = CKR_GENERAL_ERROR;
     }
+    (void)nss_ZFreeIf(rv);
     return (nssCKFWHash *)NULL;
   }
 
   rv->plHashTable = PL_NewHashTable(0, nss_ckfw_identity_hash, 
     PL_CompareValues, PL_CompareValues, &nssArenaHashAllocOps, arena);
   if (!rv->plHashTable) {
     (void)nssCKFWMutex_Destroy(rv->mutex);
     (void)nss_ZFreeIf(rv);
     *pError = CKR_HOST_MEMORY;
     return (nssCKFWHash *)NULL;
@@ skipping 190 matching lines @@
   if( CKR_OK != nssCKFWMutex_Lock(hash->mutex) ) {
     return;
   }
 
   PL_HashTableEnumerateEntries(hash->plHashTable, nss_ckfwhash_enumerator, &as);
 
   (void)nssCKFWMutex_Unlock(hash->mutex);
 
   return;
 }