Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pki/pki3hack.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/. */
 
 /*
  * Hacks to integrate NSS 3.4 and NSS 4.0 certificates.
  */
 
 #ifndef NSSPKI_H
 #include "nsspki.h"
@@ skipping 210 matching lines @@
 }
 
 /* this function should not be a hack; it will be needed in 4.0 (rename) */
 NSS_IMPLEMENT NSSItem *
 STAN_GetCertIdentifierFromDER(NSSArena *arenaOpt, NSSDER *der)
 {
     NSSItem *rvKey;
     SECItem secDER;
     SECItem secKey = { 0 };
     SECStatus secrv;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
 
     SECITEM_FROM_NSSITEM(&secDER, der);
 
     /* nss3 call uses nss3 arena's */
     arena = PORT_NewArena(256);
     if (!arena) {
         return NULL;
     }
     secrv = CERT_KeyFromDERCert(arena, &secDER, &secKey);
     if (secrv != SECSuccess) {
@@ skipping 301 matching lines @@
 )
 {
     CERTCertificate *cert = (CERTCertificate *)dc->data;
 
     /* The decoder may only be half initialized (the case where we find we 
      * could not decode the certificate). In this case, there is not cert to
      * free, just free the dc structure. */
     if (cert) {
         PRBool freeSlot = cert->ownSlot;
         PK11SlotInfo *slot = cert->slot;
-        PRArenaPool *arena  = cert->arena;
+        PLArenaPool *arena  = cert->arena;
         /* zero cert before freeing. Any stale references to this cert
          * after this point will probably cause an exception.  */
         PORT_Memset(cert, 0, sizeof *cert);
         /* free the arena that contains the cert. */
         PORT_FreeArena(arena, PR_FALSE);
         if (slot && freeSlot) {
             PK11_FreeSlot(slot);
         }
     }
     nss_ZFreeIf(dc);
@@ skipping 14 matching lines @@
     if (t == nssTrustLevel_NotTrusted) {
         rt |= CERTDB_TERMINAL_RECORD;
     }
     if (t == nssTrustLevel_ValidDelegator) {
         rt |= CERTDB_VALID_CA;
     }
     return rt;
 }
 
 static CERTCertTrust *
-cert_trust_from_stan_trust(NSSTrust *t, PRArenaPool *arena)
+cert_trust_from_stan_trust(NSSTrust *t, PLArenaPool *arena)
 {
     CERTCertTrust *rvTrust;
     unsigned int client;
     if (!t) {
         return NULL;
     }
     rvTrust = PORT_ArenaAlloc(arena, sizeof(CERTCertTrust));
     if (!rvTrust) return NULL;
     rvTrust->sslFlags = get_nss3trust_from_nss4trust(t->serverAuth);
     client = get_nss3trust_from_nss4trust(t->clientAuth);
@@ skipping 823 matching lines @@
     td = STAN_GetDefaultTrustDomain();
     cc = STAN_GetDefaultCryptoContext();
     printf("\n\nCertificates in the cache:\n");
     nssTrustDomain_DumpCacheInfo(td, cert_dump_iter, NULL);
     printf("\n\nCertificates in the temporary store:\n");
     if (cc->certStore) {
         nssCertificateStore_DumpStoreInfo(cc->certStore, cert_dump_iter, NULL);
     }
 }