Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7decode.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/. */
 
 /*
  * PKCS7 decoding, verification.
  */
 
 #include "p7local.h"
 
@@ skipping 1272 matching lines @@
                            SECCertUsage certusage,
                            const SECItem *detached_digest,
                            HASH_HashType digest_type,
                            PRBool keepcerts,
                            const PRTime *atTime)
 {
     SECAlgorithmID **digestalgs, *bulkid;
     const SECItem *digest;
     SECItem **digests;
     SECItem **rawcerts;
-    CERTSignedCrl **crls;
     SEC_PKCS7SignerInfo **signerinfos, *signerinfo;
     CERTCertificate *cert, **certs;
     PRBool goodsig;
     CERTCertDBHandle *certdb, *defaultdb; 
     SECOidTag encTag,digestTag;
     HASH_HashType found_type;
     int i, certcount;
     SECKEYPublicKey *publickey;
     SECItem *content_type;
     PK11SymKey *sigkey;
@@ skipping 29 matching lines @@
         /* Could only get here if SEC_PKCS7ContentIsSigned is broken. */
         PORT_Assert (0);
       case SEC_OID_PKCS7_SIGNED_DATA:
         {
             SEC_PKCS7SignedData *sdp;
 
             sdp = cinfo->content.signedData;
             digestalgs = sdp->digestAlgorithms;
             digests = sdp->digests;
             rawcerts = sdp->rawCerts;
-            crls = sdp->crls;
             signerinfos = sdp->signerInfos;
             content_type = &(sdp->contentInfo.contentType);
             sigkey = NULL;
             bulkid = NULL;
         }
         break;
       case SEC_OID_PKCS7_SIGNED_ENVELOPED_DATA:
         {
             SEC_PKCS7SignedAndEnvelopedData *saedp;
 
             saedp = cinfo->content.signedAndEnvelopedData;
             digestalgs = saedp->digestAlgorithms;
             digests = saedp->digests;
             rawcerts = saedp->rawCerts;
-            crls = saedp->crls;
             signerinfos = saedp->signerInfos;
             content_type = &(saedp->encContentInfo.contentType);
             sigkey = saedp->sigKey;
             bulkid = &(saedp->encContentInfo.contentEncAlg);
         }
         break;
     }
 
     if ((signerinfos == NULL) || (signerinfos[0] == NULL)) {
         PORT_SetError (SEC_ERROR_PKCS7_BAD_SIGNATURE);
@@ skipping 554 matching lines @@
     /*
      * No signature, or more than one, means no deal.
      */
     if (signerinfos == NULL || signerinfos[0] == NULL || signerinfos[1] != NULL)
         return NULL;
 
     attr = sec_PKCS7FindAttribute (signerinfos[0]->authAttr,
                                    SEC_OID_PKCS9_SIGNING_TIME, PR_TRUE);
     return sec_PKCS7AttributeValue (attr);
 }