Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.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/. */
 /*
  * pkix_pl_object.c
  *
  * Object Construction, Destruction and Callback Functions
  *
  */
 
@@ skipping 353 matching lines @@
  */
 static PKIX_Error *
 pkix_pl_Object_Hashcode_Default(
         PKIX_PL_Object *object,
         PKIX_UInt32 *pValue,
         void *plContext)
 {
         PKIX_ENTER(OBJECT, "pkix_pl_Object_Hashcode_Default");
         PKIX_NULLCHECK_TWO(object, pValue);
 
-        *pValue = (PKIX_UInt32)object;
+        *pValue = (PKIX_UInt32)((char *)object - (char *)NULL);
 
         PKIX_RETURN(OBJECT);
 }
 
 /*
  * FUNCTION: pkix_pl_Object_RetrieveEqualsCallback
  * DESCRIPTION:
  *
  *  Retrieves Equals callback function of Object pointed to by "object and
  *  stores it at "pEqualsCallback". If the object's type is one of the system
@@ skipping 208 matching lines @@
         }
 
         PKIX_OBJECT_DEBUG("\tShifting object pointer).\n");
 
 
         /* Return a pointer to the user data. Need to offset by object size */
         *pObject = object + 1;
         object = NULL;
 
         /* Atomically increment object counter */
-        PR_ATOMIC_INCREMENT(&ctEntry->objCounter);
+        PR_ATOMIC_INCREMENT((PRInt32*)&ctEntry->objCounter);
 
 cleanup:
 
         PKIX_FREE(object);
 
         PKIX_RETURN(OBJECT);
 }
 
 /*
  * FUNCTION: PKIX_PL_Object_IsTypeRegistered (see comments in pkix_pl_system.h)
@@ skipping 276 matching lines @@
                 /* Call destructor on user data if necessary */
                 pkixErrorResult = destructor(object, plContext);
                 if (pkixErrorResult) {
                     pkixErrorClass = PKIX_FATAL_ERROR;
                     PKIX_DoAddError(stdVarsPtr, pkixErrorResult, plContext);
                     pkixErrorResult = NULL;
                 }
             }
             
             /* Atomically decrement object counter */
-            PR_ATOMIC_DECREMENT(&ctEntry->objCounter);
+            PR_ATOMIC_DECREMENT((PRInt32*)&ctEntry->objCounter);
             
             /* pkix_pl_Object_Destroy assumes the lock is held */
             /* It will call unlock and destroy the object */
             pkixErrorResult = pkix_pl_Object_Destroy(object, plContext);
             goto cleanup;
         }
 
         if (refCount < 0) {
             PKIX_ERROR_ALLOC_ERROR();
         }
@@ skipping 520 matching lines @@
         /* Shift pointer from user data to object header */
         PKIX_CHECK(pkix_pl_Object_GetHeader(object, &objectHeader, plContext),
                     PKIX_RECEIVEDCORRUPTEDOBJECTARGUMENT);
 
         *pType = objectHeader->type;
 
 cleanup:
 
         PKIX_RETURN(OBJECT);
 }