Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pkcs7/p7create.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 creation.
  */
 
 #include "p7local.h"
 
 #include "cert.h"
 #include "secasn1.h"
 #include "secitem.h"
 #include "secoid.h"
 #include "pk11func.h"
 #include "prtime.h"
 #include "secerr.h"
 #include "secder.h"
 #include "secpkcs5.h"
 
 const int NSS_PBE_DEFAULT_ITERATION_COUNT = 2000; /* used in p12e.c too */
 
 static SECStatus
-sec_pkcs7_init_content_info (SEC_PKCS7ContentInfo *cinfo, PRArenaPool *poolp,
+sec_pkcs7_init_content_info (SEC_PKCS7ContentInfo *cinfo, PLArenaPool *poolp,
                              SECOidTag kind, PRBool detached)
 {
     void *thing;
     int version;
     SECItem *versionp;
     SECStatus rv;
 
     PORT_Assert (cinfo != NULL && poolp != NULL);
     if (cinfo == NULL || poolp == NULL)
         return SECFailure;
@@ skipping 68 matching lines @@
 
     return SECSuccess;
 }
 
 
 static SEC_PKCS7ContentInfo *
 sec_pkcs7_create_content_info (SECOidTag kind, PRBool detached,
                                SECKEYGetPasswordKey pwfn, void *pwfn_arg)
 {
     SEC_PKCS7ContentInfo *cinfo;
-    PRArenaPool *poolp;
+    PLArenaPool *poolp;
     SECStatus rv;
 
     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 273 matching lines @@
     if (rv != SECSuccess) {
         SEC_PKCS7DestroyContentInfo (cinfo);
         return NULL;
     }
 
     return cinfo;
 }
 
 
 static SEC_PKCS7Attribute *
-sec_pkcs7_create_attribute (PRArenaPool *poolp, SECOidTag oidtag,
+sec_pkcs7_create_attribute (PLArenaPool *poolp, SECOidTag oidtag,
                             SECItem *value, PRBool encoded)
 {
     SEC_PKCS7Attribute *attr;
     SECItem **values;
     void *mark;
 
     PORT_Assert (poolp != NULL);
     mark = PORT_ArenaMark (poolp);
 
     attr = (SEC_PKCS7Attribute*)PORT_ArenaAlloc (poolp, 
@@ skipping 530 matching lines @@
     if (kind != SEC_OID_PKCS7_SIGNED_DATA
         && kind != SEC_OID_PKCS7_SIGNED_ENVELOPED_DATA)
         return SECFailure;              /* XXX set an error? */
 
     return sec_pkcs7_add_certificate (cinfo, cert);
 }
 
 
 static SECStatus
 sec_pkcs7_init_encrypted_content_info (SEC_PKCS7EncryptedContentInfo *enccinfo,
-                                       PRArenaPool *poolp,
+                                       PLArenaPool *poolp,
                                        SECOidTag kind, PRBool detached,
                                        SECOidTag encalg, int keysize)
 {
     SECStatus rv;
 
     PORT_Assert (enccinfo != NULL && poolp != NULL);
     if (enccinfo == NULL || poolp == NULL)
         return SECFailure;
 
     /*
@@ skipping 313 matching lines @@
                                                 SEC_OID_PKCS7_DATA, PR_FALSE,
                                                 algorithm, keysize);
     if (rv != SECSuccess) {
         SEC_PKCS7DestroyContentInfo (cinfo);
         return NULL;
     }
 
     return cinfo;
 }