Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/include/pkix_certstore.h

 /* 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/. */
 /*
  * This file defines functions associated with the PKIX_CertStore type.
  *
  */
 
 #ifndef _PKIX_CERTSTORE_H
 #define _PKIX_CERTSTORE_H
 
 #include "pkixt.h"
+#include "certt.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* General
  *
  * Please refer to the libpkix Programmer's Guide for detailed information
  * about how to use the libpkix library. Certain key warnings and notices from
  * that document are repeated here for emphasis.
@@ skipping 297 matching lines @@
  *  Returns a CertStore Error if the function fails in a non-fatal way.
  *  Returns a Fatal Error if the function fails in an unrecoverable way.
  */
 typedef PKIX_Error *
 (*PKIX_CertStore_CheckRevokationByCrlCallback)(
         PKIX_CertStore *store,
         PKIX_PL_Cert *cert,
         PKIX_PL_Cert *issuer,
         PKIX_PL_Date *date,
         PKIX_Boolean  crlDownloadDone,
-        PKIX_UInt32 *reasonCode,
+        CERTCRLEntryReasonCode *reasonCode,
         PKIX_RevocationStatus *revStatus,
         void *plContext);
 
 /*
  * FUNCTION: PKIX_CertStore_CrlContinue
  * DESCRIPTION:
  *
  *  This function continues the non-blocking operation initiated by an earlier
  *  call to the CRLCallback function, for the CertStore pointed to by "store". 
  *  If an earlier call did not terminate with the WOULDBLOCK indication (non-NULL
@@ skipping 363 matching lines @@
 PKIX_CertStore_GetLocalFlag(
         PKIX_CertStore *store,
         PKIX_Boolean *pLocalFlag,
         void *plContext);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _PKIX_CERTSTORE_H */