Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11pk12.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/. */
 /*
  * This file PKCS #12 fuctions that should really be moved to the
  * PKCS #12 directory, however we can't do that in a point release
  * because that will break binary compatibility, so we keep them here for now.
  */
 
@@ skipping 12 matching lines @@
 
 /* These data structures should move to a common .h file shared between the
  * wrappers and the pkcs 12 code. */
 
 /*
 ** RSA Raw Private Key structures
 */
 
 /* member names from PKCS#1, section 7.2 */
 struct SECKEYRSAPrivateKeyStr {
-    PRArenaPool * arena;
+    PLArenaPool * arena;
     SECItem version;
     SECItem modulus;
     SECItem publicExponent;
     SECItem privateExponent;
     SECItem prime1;
     SECItem prime2;
     SECItem exponent1;
     SECItem exponent2;
     SECItem coefficient;
 };
 typedef struct SECKEYRSAPrivateKeyStr SECKEYRSAPrivateKey;
 
 
 /*
 ** DSA Raw Private Key structures
 */
 
 struct SECKEYDSAPrivateKeyStr {
     SECKEYPQGParams params;
     SECItem privateValue;
 };
 typedef struct SECKEYDSAPrivateKeyStr SECKEYDSAPrivateKey;
 
 /*
 ** Diffie-Hellman Raw Private Key structures
 ** Structure member names suggested by PKCS#3.
 */
 struct SECKEYDHPrivateKeyStr {
-    PRArenaPool * arena;
+    PLArenaPool * arena;
     SECItem prime;
     SECItem base;
     SECItem privateValue;
 };
 typedef struct SECKEYDHPrivateKeyStr SECKEYDHPrivateKey;
 
 /*
 ** raw private key object
 */
 struct SECKEYRawPrivateKeyStr {
@@ skipping 137 matching lines @@
         nickname, publicValue, isPerm, isPrivate, keyUsage, NULL, wincx);
 }
 
 SECStatus
 PK11_ImportDERPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot, SECItem *derPKI, 
         SECItem *nickname, SECItem *publicValue, PRBool isPerm, 
         PRBool isPrivate, unsigned int keyUsage, SECKEYPrivateKey** privk,
         void *wincx) 
 {
     SECKEYPrivateKeyInfo *pki = NULL;
-    PRArenaPool *temparena = NULL;
+    PLArenaPool *temparena = NULL;
     SECStatus rv = SECFailure;
 
     temparena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if (!temparena)
         return rv;
     pki = PORT_ArenaZNew(temparena, SECKEYPrivateKeyInfo);
     if (!pki) {
         PORT_FreeArena(temparena, PR_FALSE);
         return rv;
     }
@@ skipping 188 matching lines @@
 PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
         SECKEYPrivateKeyInfo *pki, SECItem *nickname, SECItem *publicValue,
         PRBool isPerm, PRBool isPrivate, unsigned int keyUsage,
         SECKEYPrivateKey **privk, void *wincx) 
 {
     CK_KEY_TYPE keyType = CKK_RSA;
     SECStatus rv = SECFailure;
     SECKEYRawPrivateKey *lpk = NULL;
     const SEC_ASN1Template *keyTemplate, *paramTemplate;
     void *paramDest = NULL;
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
 
     arena = PORT_NewArena(2048);
     if(!arena) {
         return SECFailure;
     }
 
     /* need to change this to use RSA/DSA keys */
     lpk = (SECKEYRawPrivateKey *)PORT_ArenaZAlloc(arena,
                                                   sizeof(SECKEYRawPrivateKey));
     if(lpk == NULL) {
@@ skipping 69 matching lines @@
 SECStatus
 PK11_ImportPrivateKeyInfo(PK11SlotInfo *slot, SECKEYPrivateKeyInfo *pki, 
         SECItem *nickname, SECItem *publicValue, PRBool isPerm, 
         PRBool isPrivate, unsigned int keyUsage, void *wincx) 
 {
     return PK11_ImportPrivateKeyInfoAndReturnKey(slot, pki, nickname,
         publicValue, isPerm, isPrivate, keyUsage, NULL, wincx);
 
 }