Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix/util/pkix_logger.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_logger.c
  *
  * Logger Object Functions
  *
  */
 
@@ skipping 474 matching lines @@
         PKIX_NULLCHECK_TWO(object, pHashcode);
 
         PKIX_CHECK(pkix_CheckType(object, PKIX_LOGGER_TYPE, plContext),
                     PKIX_OBJECTNOTLOGGER);
 
         logger = (PKIX_Logger *)object;
 
         PKIX_HASHCODE(logger->context, &tempHash, plContext,
                 PKIX_OBJECTHASHCODEFAILED);
 
-        hash = (((((PKIX_UInt32) logger->callback + tempHash) << 7) +
+        hash = (((((PKIX_UInt32)((char *)logger->callback - (char *)NULL) + tempHash) << 7) +
                 logger->maxLevel) << 7) + (PKIX_UInt32)logger->logComponent;
 
         *pHashcode = hash;
 
 cleanup:
 
         PKIX_RETURN(LOGGER);
 }
 
 
@@ skipping 573 matching lines @@
         pkixLoggersErrors = savedPkixLoggersErrors;
         pkixLoggersDebugTrace = savedPkixLoggersDebugTrace;
 
         if (locked) {
                 PKIX_CHECK(PKIX_PL_MonitorLock_Exit(pkixLoggerLock, plContext),
                         PKIX_MONITORLOCKEXITFAILED);
         }
 
        PKIX_RETURN(LOGGER);
 }