Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/softoken/lowpbe.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"
@@ skipping 408 matching lines @@
 #define NSSPBE_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
 #define NSSPBE_MIN(x,y) ((x) < (y) ? (x) : (y))
 /*
  * This is the extended PBE function defined by the final PKCS #12 spec.
  */
 static SECItem *
 nsspkcs5_PKCS12PBE(const SECHashObject *hashObject, 
                    NSSPKCS5PBEParameter *pbe_param, SECItem *pwitem, 
                    PBEBitGenID bitGenPurpose, unsigned int bytesNeeded)
 {
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     unsigned int SLen,PLen;
     unsigned int hashLength = hashObject->length;
     unsigned char *S, *P;
     SECItem *A = NULL, B, D, I;
     SECItem *salt = &pbe_param->salt;
     unsigned int c,i = 0;
     unsigned int hashLen;
     int iter;
     unsigned char *iterBuf;
     void *hash = NULL;
@@ skipping 294 matching lines @@
     }
 
     return SECSuccess;
 }
 
 /* decode the algid and generate a PKCS 5 parameter from it
  */
 NSSPKCS5PBEParameter *
 nsspkcs5_NewParam(SECOidTag alg, SECItem *salt, int iterator)
 {
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     NSSPKCS5PBEParameter *pbe_param = NULL;
     SECStatus rv = SECFailure;
 
     arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
     if (arena == NULL)
         return NULL;
 
     /* allocate memory for the parameter */
     pbe_param = (NSSPKCS5PBEParameter *)PORT_ArenaZAlloc(arena, 
         sizeof(NSSPKCS5PBEParameter));
@@ skipping 515 matching lines @@
 
 /* creates a algorithm ID containing the PBE algorithm and appropriate
  * parameters.  the required parameter is the algorithm.  if salt is
  * not specified, it is generated randomly.  if IV is specified, it overrides
  * the PKCS 5 generation of the IV.  
  *
  * the returned SECAlgorithmID should be destroyed using 
  * SECOID_DestroyAlgorithmID
  */
 SECAlgorithmID *
-nsspkcs5_CreateAlgorithmID(PRArenaPool *arena, SECOidTag algorithm, 
+nsspkcs5_CreateAlgorithmID(PLArenaPool *arena, SECOidTag algorithm,
                                         NSSPKCS5PBEParameter *pbe_param)
 {
     SECAlgorithmID *algid, *ret_algid = NULL;
     SECItem der_param;
     nsspkcs5V2PBEParameter pkcs5v2_param;
 
     SECStatus rv = SECFailure;
     void *dummy = NULL;
 
     if (arena == NULL) {
@@ skipping 78 matching lines @@
     rv = SECOID_CopyAlgorithmID(NULL, ret_algid, algid);
     if (rv != SECSuccess) {
         SECOID_DestroyAlgorithmID(ret_algid, PR_TRUE);
         ret_algid = NULL;
     }
 
 loser:  
 
     return ret_algid;
 }