Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix/util/pkix_error.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_error.c
  *
  * Error Object Functions
  *
  */
 
@@ skipping 307 matching lines @@
 pkix_Error_Hashcode(
         PKIX_PL_Object *object,
         PKIX_UInt32 *pResult,
         void *plContext)
 {
         PKIX_ENTER(ERROR, "pkix_Error_Hashcode");
         PKIX_NULLCHECK_TWO(object, pResult);
 
         /* XXX Unimplemented */
         /* XXX Need to make hashcodes equal when two errors are equal */
-        *pResult = (PKIX_UInt32)object;
+        *pResult = (PKIX_UInt32)((char *)object - (char *)NULL);
 
         PKIX_RETURN(ERROR);
 }
 
 /* --Initializers------------------------------------------------- */
 
 /*
  * PKIX_ERRORCLASSNAMES is an array of strings, with each string holding a
  * descriptive name for an error errClass. This is used by the default
  * PKIX_PL_Error_ToString function.
@@ skipping 217 matching lines @@
                               errorStr,
 #endif
                               0,
                               &descString,
                               plContext);
 
         *pDesc = descString;
 
         PKIX_RETURN(ERROR);
 }