Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix/store/pkix_store.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_store.c
  *
  * CertStore Function Definitions
  *
  */
 
@@ skipping 56 matching lines @@
         certStore = (PKIX_CertStore *)object;
 
         if (certStore->certStoreContext) {
                 PKIX_CHECK(PKIX_PL_Object_Hashcode
                     ((PKIX_PL_Object *) certStore->certStoreContext,
                     &tempHash,
                     plContext),
                    PKIX_CERTSTOREHASHCODEFAILED);
         }
 
-        *pHashcode = (PKIX_UInt32) certStore->certCallback +
-                     (PKIX_UInt32) certStore->crlCallback +
-                     (PKIX_UInt32) certStore->certContinue +
-                     (PKIX_UInt32) certStore->crlContinue +
-                     (PKIX_UInt32) certStore->trustCallback +
+        *pHashcode = (PKIX_UInt32)((char *)certStore->certCallback - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->crlCallback - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->certContinue - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->crlContinue - (char *)NULL) +
+                     (PKIX_UInt32)((char *)certStore->trustCallback - (char *)NULL) +
                      (tempHash << 7);
 
 cleanup:
 
         PKIX_RETURN(CERTSTORE);
 }
 
 /*
  * FUNCTION: pkix_CertStore_Equals
  * (see comments for PKIX_PL_EqualsCallback in pkix_pl_system.h)
@@ skipping 314 matching lines @@
         PKIX_Boolean *pLocalFlag,
         void *plContext)
 {
         PKIX_ENTER(CERTSTORE, "PKIX_CertStore_GetLocalFlag");
         PKIX_NULLCHECK_TWO(store, pLocalFlag);
 
         *pLocalFlag = store->localFlag;
 
         PKIX_RETURN(CERTSTORE);
 }