Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/certhigh/certreq.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/. */
 
 #include "cert.h"
 #include "certt.h"
 #include "secder.h"
 #include "key.h"
 #include "secitem.h"
 #include "secasn1.h"
@@ skipping 34 matching lines @@
 SEC_ASN1_CHOOSER_IMPLEMENT(CERT_CertificateRequestTemplate)
 
 CERTCertificate *
 CERT_CreateCertificate(unsigned long serialNumber,
                       CERTName *issuer,
                       CERTValidity *validity,
                       CERTCertificateRequest *req)
 {
     CERTCertificate *c;
     int rv;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     
     if ( !arena ) {
         return(0);
     }
 
     c = (CERTCertificate *)PORT_ArenaZAlloc(arena, sizeof(CERTCertificate));
     
     if (!c) {
@@ skipping 51 matching lines @@
  * single attribute of the cert request. In this implementation there is at most
  * one attribute and it is always of type SEC_OID_PKCS9_EXTENSION_REQUEST.
  */
 
 CERTCertificateRequest *
 CERT_CreateCertificateRequest(CERTName *subject,
                              CERTSubjectPublicKeyInfo *spki,
                              SECItem **attributes)
 {
     CERTCertificateRequest *certreq;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     CERTAttribute * attribute;
     SECOidData * oidData;
     SECStatus rv;
     int i = 0;
 
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if ( arena == NULL ) {
         return NULL;
     }
     
@@ skipping 95 matching lines @@
 setCRExt(void *o, CERTCertExtension **exts)
 {
     ((CERTCertificateRequest *)o)->attributes = (struct CERTAttributeStr **)exts;
 }
 
 /*
 ** Set up to start gathering cert extensions for a cert request.
 ** The list is created as CertExtensions and converted to an
 ** attribute list by CERT_FinishCRAttributes().
  */
-extern void *cert_StartExtensions(void *owner, PRArenaPool *ownerArena,
+extern void *cert_StartExtensions(void *owner, PLArenaPool *ownerArena,
                        void (*setExts)(void *object, CERTCertExtension **exts));
 void *
 CERT_StartCertificateRequestAttributes(CERTCertificateRequest *req)
 {
     return (cert_StartExtensions ((void *)req, req->arena, setCRExt));
 }
 
 /*
 ** At entry req->attributes actually contains an list of cert extensions--
 ** req-attributes is overloaded until the list is DER encoded (the first
@@ skipping 61 matching lines @@
     
     if ((*req->attributes)->attrValue == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
 
     return(SEC_ASN1DecodeItem(req->arena, exts, 
             SEC_ASN1_GET(CERT_SequenceOfCertExtensionTemplate),
             (*req->attributes)->attrValue[0]));
 }