Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix/checker/pkix_revocationchecker.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_revocationchecker.c
  *
  * RevocationChecker Object Functions
  *
  */
 
@@ skipping 331 matching lines @@
 
     PORT_Memset(methodStatus, PKIX_RevStatus_NoInfo,
                 sizeof(PKIX_RevocationStatus) * PKIX_RevocationMethod_MAX);
 
     date = procParams->date;
 
     /* Need to have two loops if we testing all local info first:
      *    first we are going to test all local(cached) info
      *    second, all remote info(fetching) */
     for (tries = 0;tries < 2;tries++) {
-        int methodNum = 0;
+        unsigned int methodNum = 0;
         for (;methodNum < revList->length;methodNum++) {
             PKIX_UInt32 methodFlags = 0;
 
             PKIX_DECREF(method);
             PKIX_CHECK(
                 PKIX_List_GetItem(revList, methodNum,
                                   (PKIX_PL_Object**)&method, plContext),
                 PKIX_LISTGETITEMFAILED);
             methodFlags = method->flags;
             if (!(methodFlags & PKIX_REV_M_TEST_USING_THIS_METHOD)) {
                 /* Will not check with this method. Skipping... */
                 continue;
             }
             if (!onlyUseRemoteMethods &&
                 methodStatus[methodNum] == PKIX_RevStatus_NoInfo) {
                 PKIX_RevocationStatus revStatus = PKIX_RevStatus_NoInfo;
                 PKIX_CHECK_NO_GOTO(
                     (*method->localRevChecker)(cert, issuer, date,
                                                method, procParams,
                                                methodFlags, 
                                                chainVerificationState,
                                                &revStatus,
-                                               pReasonCode, plContext),
+                                               (CERTCRLEntryReasonCode *)pReasonCode,
+                                               plContext),
                     PKIX_REVCHECKERCHECKFAILED);
                 methodStatus[methodNum] = revStatus;
                 if (revStatus == PKIX_RevStatus_Revoked) {
                     /* if error was generated use it as final error. */
                     overallStatus = PKIX_RevStatus_Revoked;
                     goto cleanup;
                 }
                 if (pkixErrorResult) {
                     /* Disregard errors. Only returned revStatus matters. */
                     PKIX_PL_Object_DecRef((PKIX_PL_Object*)pkixErrorResult,
                                           plContext);
                     pkixErrorResult = NULL;
                 }
             }
             if ((!(revFlags & PKIX_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST) ||
                  onlyUseRemoteMethods) &&
                 chainVerificationState &&
                 methodStatus[methodNum] == PKIX_RevStatus_NoInfo) {
                 if (!(methodFlags & PKIX_REV_M_FORBID_NETWORK_FETCHING)) {
                     PKIX_RevocationStatus revStatus = PKIX_RevStatus_NoInfo;
                     PKIX_CHECK_NO_GOTO(
                         (*method->externalRevChecker)(cert, issuer, date,
                                                       method,
                                                       procParams, methodFlags,
-                                                      &revStatus, pReasonCode,
+                                                      &revStatus,
+                                                      (CERTCRLEntryReasonCode *)pReasonCode,
                                                       &nbioContext, plContext),
                         PKIX_REVCHECKERCHECKFAILED);
                     methodStatus[methodNum] = revStatus;
                     if (revStatus == PKIX_RevStatus_Revoked) {
                         /* if error was generated use it as final error. */
                         overallStatus = PKIX_RevStatus_Revoked;
                         goto cleanup;
                     }
                     if (pkixErrorResult) {
                         /* Disregard errors. Only returned revStatus matters. */
@@ skipping 53 matching lines @@
         }
     }
 
 cleanup:
     *pRevStatus = overallStatus;
     PKIX_DECREF(method);
 
     PKIX_RETURN(REVOCATIONCHECKER);
 }