Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11pbe.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 "plarena.h"
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "secport.h"
 #include "hasht.h"
 #include "pkcs11t.h"
 #include "sechash.h"
 #include "secasn1.h"
 #include "secder.h"
 #include "secoid.h"
 #include "secerr.h"
 #include "secmod.h"
 #include "pk11func.h"
 #include "secpkcs5.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pkcs11.h"
 #include "pk11func.h"
 #include "secitem.h"
 #include "key.h"
 
 typedef struct SEC_PKCS5PBEParameterStr SEC_PKCS5PBEParameter;
 struct SEC_PKCS5PBEParameterStr {
-    PRArenaPool     *poolp;
+    PLArenaPool     *poolp;
     SECItem         salt;           /* octet string */
     SECItem         iteration;      /* integer */
     SECItem         keyLength;  /* PKCS5v2 only */
     SECAlgorithmID  *pPrfAlgId; /* PKCS5v2 only */
     SECAlgorithmID  prfAlgId;   /* PKCS5v2 only */
 };
 
 /* PKCS5 V2 has an algorithm ID for the encryption and for 
  * the key generation. This is valid for SEC_OID_PKCS5_PBES2 
  * and SEC_OID_PKCS5_PBMAC1
  */
 struct sec_pkcs5V2ParameterStr {
-    PRArenaPool    *poolp;
+    PLArenaPool    *poolp;
     SECAlgorithmID pbeAlgId;   /* real pbe algorithms */
     SECAlgorithmID cipherAlgId; /* encryption/mac */
 };
 
 typedef struct sec_pkcs5V2ParameterStr sec_pkcs5V2Parameter;
 
 
 /* template for PKCS 5 PBE Parameter.  This template has been expanded
  * based upon the additions in PKCS 12.  This should eventually be moved
  * if RSA updates PKCS 5.
@@ skipping 84 matching lines @@
     }
 
     return SEC_OID_UNKNOWN;
 }
 
 /*
  * get a new PKCS5 V2 Parameter from the algorithm id.
  *  if arena is passed in, use it, otherwise create a new arena.
  */
 sec_pkcs5V2Parameter *
-sec_pkcs5_v2_get_v2_param(PRArenaPool *arena, SECAlgorithmID *algid)
+sec_pkcs5_v2_get_v2_param(PLArenaPool *arena, SECAlgorithmID *algid)
 {
-    PRArenaPool *localArena = NULL;
+    PLArenaPool *localArena = NULL;
     sec_pkcs5V2Parameter *pbeV2_param;
     SECStatus rv;
 
     if (arena == NULL) {
         localArena = arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
         if (arena == NULL) {
             return NULL;
         }
     }
     pbeV2_param = PORT_ArenaZNew(arena, sec_pkcs5V2Parameter);
@@ skipping 146 matching lines @@
     return SEC_OID_UNKNOWN;
 }
 
 /*
  * get the key length in bytes from a PKCS5 PBE
  */
 int
 sec_pkcs5v2_key_length(SECAlgorithmID *algid)
 {
     SECOidTag algorithm;
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     SEC_PKCS5PBEParameter p5_param;
     SECStatus rv;
     int length = -1;
 
     algorithm = SECOID_GetAlgorithmTag(algid);
     /* sanity check, they should all be PBKDF2 here */
     if (algorithm != SEC_OID_PKCS5_PBKDF2) {
         return -1;
     }
 
@@ skipping 137 matching lines @@
  * sec_pkcs5_destroy_pbe_parameter or SEC_PKCS5DestroyPBEParameter.
  */
 #define DEFAULT_SALT_LENGTH 16
 static SEC_PKCS5PBEParameter *
 sec_pkcs5_create_pbe_parameter(SECOidTag algorithm, 
                         SECItem *salt, 
                         int iteration,
                         int keyLength,
                         SECOidTag prfAlg)
 {
-    PRArenaPool *poolp = NULL;
+    PLArenaPool *poolp = NULL;
     SEC_PKCS5PBEParameter *pbe_param = NULL;
     SECStatus rv= SECSuccess; 
     void *dummy = NULL;
 
     if(iteration < 0) {
         return NULL;
     }
 
     poolp = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
     if(poolp == NULL)
@@ skipping 67 matching lines @@
  */
 SECAlgorithmID *
 sec_pkcs5CreateAlgorithmID(SECOidTag algorithm, 
                            SECOidTag cipherAlgorithm,
                            SECOidTag prfAlg,
                            SECOidTag *pPbeAlgorithm,
                            int keyLength,
                            SECItem *salt, 
                            int iteration)
 {
-    PRArenaPool *poolp = NULL;
+    PLArenaPool *poolp = NULL;
     SECAlgorithmID *algid, *ret_algid = NULL;
     SECOidTag pbeAlgorithm = algorithm;
     SECItem der_param;
     void *dummy;
     SECStatus rv = SECFailure;
     SEC_PKCS5PBEParameter *pbe_param = NULL;
     sec_pkcs5V2Parameter pbeV2_param;
 
     if(iteration <= 0) {
         return NULL;
@@ skipping 160 matching lines @@
 
     return ret_algid;
 }
 
 SECStatus
 pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech)
 {
     SEC_PKCS5PBEParameter p5_param;
     SECItem *salt = NULL;
     SECOidTag algorithm = SECOID_GetAlgorithmTag(algid);
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     SECStatus rv = SECFailure;
     unsigned char *paramData = NULL;
     unsigned char *pSalt = NULL;
     CK_ULONG iterations;
     int paramLen = 0;
     int iv_len;
     
 
     arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
     if (arena == NULL) {
@@ skipping 107 matching lines @@
     return SECFailure;
 }
 
 /*
  * public, deprecated, not valid for pkcs5 v2 
  * 
  * use PK11_CreatePBEV2AlgorithmID or PK11_CreatePBEAlgorithmID to create
  * PBE algorithmID's directly.
  */
 SECStatus
-PBE_PK11ParamToAlgid(SECOidTag algTag, SECItem *param, PRArenaPool *arena, 
+PBE_PK11ParamToAlgid(SECOidTag algTag, SECItem *param, PLArenaPool *arena,
                      SECAlgorithmID *algId)
 {
     CK_PBE_PARAMS *pbe_param;
     SECItem pbeSalt;
     SECAlgorithmID *pbeAlgID = NULL;
     SECStatus rv;
 
     if(!param || !algId) {
         return SECFailure;
     }
@@ skipping 541 matching lines @@
  *
  * This function returns both the mechanism and the parameter for the mechanism.
  * The caller is responsible for freeing the parameter.
  */
 CK_MECHANISM_TYPE
 PK11_GetPBECryptoMechanism(SECAlgorithmID *algid, SECItem **param, 
                            SECItem *pbe_pwd)
 {
     return pk11_GetPBECryptoMechanism(algid, param, pbe_pwd, PR_FALSE);
 }