Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/base/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.
  * This is a copy of ckfw/hash.c, with modifications to use NSS types
@@ skipping 33 matching lines @@
   PLHashTable *plHashTable;
   PRUint32 count;
 };
 
 static PLHashNumber
 nss_identity_hash
 (
   const void *key
 )
 {
-  PRUint32 i = (PRUint32)key;
-  PR_ASSERT(sizeof(PLHashNumber) == sizeof(PRUint32));
-  return (PLHashNumber)i;
+  return (PLHashNumber)((char *)key - (char *)NULL);
 }
 
 static PLHashNumber
 nss_item_hash
 (
   const void *key
 )
 {
   unsigned int i;
   PLHashNumber h;
@@ skipping 297 matching lines @@
   as.closure = closure;
 
   PZ_Lock(hash->mutex);
 
   PL_HashTableEnumerateEntries(hash->plHashTable, nss_hash_enumerator, &as);
 
   (void)PZ_Unlock(hash->mutex);
 
   return;
 }