Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix/crlsel/pkix_crlselector.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_crlselector.c
  *
  * CRLSelector Function Definitions
  *
  */
 
@@ skipping 172 matching lines @@
                     PKIX_OBJECTNOTCRLSELECTOR);
 
         crlSelector = (PKIX_CRLSelector *)object;
 
         PKIX_HASHCODE(crlSelector->params, &paramsHash, plContext,
                 PKIX_OBJECTHASHCODEFAILED);
 
         PKIX_HASHCODE(crlSelector->context, &contextHash, plContext,
                 PKIX_OBJECTHASHCODEFAILED);
 
-        hash = 31 * ((PKIX_UInt32)crlSelector->matchCallback +
+        hash = 31 * ((PKIX_UInt32)((char *)crlSelector->matchCallback - (char *)NULL) +
                     (contextHash << 3)) + paramsHash;
 
         *pHashcode = hash;
 
 cleanup:
 
         PKIX_RETURN(CRLSELECTOR);
 }
 
 /*
@@ skipping 657 matching lines @@
         filtered = NULL;
 
 cleanup:
 
         PKIX_DECREF(filtered);
         PKIX_DECREF(candidate);
 
         PKIX_RETURN(CRLSELECTOR);
 
 }