Allow NSS to be built with NO_NSPR_10_SUPPORT.

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 26 matching lines @@
 };
 
 struct SEC_PKCS7DecoderContextStr {
     SEC_ASN1DecoderContext *dcx;
     SEC_PKCS7ContentInfo *cinfo;
     SEC_PKCS7DecoderContentCallback cb;
     void *cb_arg;
     SECKEYGetPasswordKey pwfn;
     void *pwfn_arg;
     struct sec_pkcs7_decoder_worker worker;
-    PRArenaPool *tmp_poolp;
+    PLArenaPool *tmp_poolp;
     int error;
     SEC_PKCS7GetDecryptKeyCallback dkcb;
     void *dkcb_arg;
     SEC_PKCS7DecryptionAllowedCallback decrypt_allowed_cb;
 };
 
 /*
  * Handle one worker, decrypting and digesting the data as necessary.
  *
  * XXX If/when we support nested contents, this probably needs to be
@@ skipping 241 matching lines @@
                                       (PRBool)(p7dcx->cb != NULL));
     return SECSuccess;
 }
 
 
 /*
  * Close out all of the digest contexts, storing the results in "digestsp".
  */
 static SECStatus
 sec_pkcs7_decoder_finish_digests (SEC_PKCS7DecoderContext *p7dcx,
-                                  PRArenaPool *poolp,
+                                  PLArenaPool *poolp,
                                   SECItem ***digestsp)
 {
     struct sec_pkcs7_decoder_worker *worker;
     const SECHashObject *digobj;
     void *digcx;
     SECItem **digests, *digest;
     int i;
     void *mark;
 
     /*
@@ skipping 256 matching lines @@
      */
     if (p7dcx->cb != NULL)
         return SECFailure;
     else
         return SECSuccess;      /* Let the decoding continue. */
 }
 
 
 static SECStatus
 sec_pkcs7_decoder_finish_decrypt (SEC_PKCS7DecoderContext *p7dcx,
-                                  PRArenaPool *poolp,
+                                  PLArenaPool *poolp,
                                   SEC_PKCS7EncryptedContentInfo *enccinfo)
 {
     struct sec_pkcs7_decoder_worker *worker;
 
     /*
      * XXX Handling nested contents would mean that there is a chain
      * of workers -- one per each level of content.  The following
      * would want to find the last worker in the chain.
      */
     worker = &(p7dcx->worker);
@@ skipping 354 matching lines @@
 SEC_PKCS7DecoderContext *
 SEC_PKCS7DecoderStart(SEC_PKCS7DecoderContentCallback cb, void *cb_arg,
                       SECKEYGetPasswordKey pwfn, void *pwfn_arg,
                       SEC_PKCS7GetDecryptKeyCallback decrypt_key_cb, 
                       void *decrypt_key_cb_arg,
                       SEC_PKCS7DecryptionAllowedCallback decrypt_allowed_cb)
 {
     SEC_PKCS7DecoderContext *p7dcx;
     SEC_ASN1DecoderContext *dcx;
     SEC_PKCS7ContentInfo *cinfo;
-    PRArenaPool *poolp;
+    PLArenaPool *poolp;
 
     poolp = PORT_NewArena (1024);               /* XXX what is right value? */
     if (poolp == NULL)
         return NULL;
 
     cinfo = (SEC_PKCS7ContentInfo*)PORT_ArenaZAlloc (poolp, sizeof(*cinfo));
     if (cinfo == NULL) {
         PORT_FreeArena (poolp, PR_FALSE);
         return NULL;
     }
@@ skipping 951 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);
 }