Commit 4ee58732 authored by Brian Smith's avatar Brian Smith

Bug 802430: Allow NSS to be built with NO_NSPR_10_SUPPORT, r=wtc

parent d2fc8a1b
......@@ -74,7 +74,7 @@ static SECStatus
ConvertCRLEntry(SECItem *sdder, PRInt32 crlentry, char *nickname)
{
int rv;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTSignedCrl *newCrl = NULL;
CERTCrlEntry *entry;
......
......@@ -25,7 +25,7 @@
#include "ecl-curve.h"
SECStatus EC_DecodeParams(const SECItem *encodedParams,
ECParams **ecparams);
SECStatus EC_CopyParams(PRArenaPool *arena, ECParams *dstParams,
SECStatus EC_CopyParams(PLArenaPool *arena, ECParams *dstParams,
const ECParams *srcParams);
#endif
......@@ -207,7 +207,7 @@ static void Usage()
/* XXX argh */
struct item_with_arena {
SECItem *item;
PRArenaPool *arena;
PLArenaPool *arena;
};
static PRInt32
......@@ -231,7 +231,7 @@ get_binary(void *arg, const unsigned char *ibuf, PRInt32 size)
}
static SECStatus
atob(SECItem *ascii, SECItem *binary, PRArenaPool *arena)
atob(SECItem *ascii, SECItem *binary, PLArenaPool *arena)
{
SECStatus status;
NSSBase64Decoder *cx;
......@@ -335,7 +335,7 @@ serialize_key(SECItem *it, int ni, PRFileDesc *file)
}
void
key_from_filedata(PRArenaPool *arena, SECItem *it, int ns, int ni, SECItem *filedata)
key_from_filedata(PLArenaPool *arena, SECItem *it, int ns, int ni, SECItem *filedata)
{
int fpos = 0;
int i, len;
......@@ -364,7 +364,7 @@ static RSAPrivateKey *
rsakey_from_filedata(SECItem *filedata)
{
RSAPrivateKey *key;
PRArenaPool *arena;
PLArenaPool *arena;
arena = PORT_NewArena(BLTEST_DEFAULT_CHUNKSIZE);
key = (RSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(RSAPrivateKey));
key->arena = arena;
......@@ -376,7 +376,7 @@ static PQGParams *
pqg_from_filedata(SECItem *filedata)
{
PQGParams *pqg;
PRArenaPool *arena;
PLArenaPool *arena;
arena = PORT_NewArena(BLTEST_DEFAULT_CHUNKSIZE);
pqg = (PQGParams *)PORT_ArenaZAlloc(arena, sizeof(PQGParams));
pqg->arena = arena;
......@@ -388,7 +388,7 @@ static DSAPrivateKey *
dsakey_from_filedata(SECItem *filedata)
{
DSAPrivateKey *key;
PRArenaPool *arena;
PLArenaPool *arena;
arena = PORT_NewArena(BLTEST_DEFAULT_CHUNKSIZE);
key = (DSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(DSAPrivateKey));
key->params.arena = arena;
......@@ -401,7 +401,7 @@ static ECPrivateKey *
eckey_from_filedata(SECItem *filedata)
{
ECPrivateKey *key;
PRArenaPool *arena;
PLArenaPool *arena;
SECStatus rv;
ECParams *tmpECParams = NULL;
arena = PORT_NewArena(BLTEST_DEFAULT_CHUNKSIZE);
......@@ -627,7 +627,7 @@ typedef SECStatus (* bltestPubKeyCipherFn)(void *key,
typedef SECStatus (* bltestHashCipherFn)(unsigned char *dest,
const unsigned char *src,
uint32 src_length);
PRUint32 src_length);
typedef enum {
bltestINVALID = -1,
......@@ -776,7 +776,7 @@ typedef union
typedef struct bltestCipherInfoStr bltestCipherInfo;
struct bltestCipherInfoStr {
PRArenaPool *arena;
PLArenaPool *arena;
/* link to next in multithreaded test */
bltestCipherInfo *next;
PRThread *cipherThread;
......@@ -887,7 +887,7 @@ cipher_requires_IV(bltestCipherMode mode)
SECStatus finishIO(bltestIO *output, PRFileDesc *file);
SECStatus
setupIO(PRArenaPool *arena, bltestIO *input, PRFileDesc *file,
setupIO(PLArenaPool *arena, bltestIO *input, PRFileDesc *file,
char *str, int numBytes)
{
SECStatus rv = SECSuccess;
......@@ -1016,7 +1016,7 @@ finishIO(bltestIO *output, PRFileDesc *file)
}
void
bltestCopyIO(PRArenaPool *arena, bltestIO *dest, bltestIO *src)
bltestCopyIO(PLArenaPool *arena, bltestIO *dest, bltestIO *src)
{
SECITEM_CopyItem(arena, &dest->buf, &src->buf);
if (src->pBuf.len > 0) {
......@@ -1028,7 +1028,7 @@ bltestCopyIO(PRArenaPool *arena, bltestIO *dest, bltestIO *src)
}
void
misalignBuffer(PRArenaPool *arena, bltestIO *io, int off)
misalignBuffer(PLArenaPool *arena, bltestIO *io, int off)
{
ptrdiff_t offset = (ptrdiff_t)io->buf.data % WORDSIZE;
int length = io->buf.len;
......@@ -1681,7 +1681,7 @@ bltest_ecdsa_init(bltestCipherInfo *cipherInfo, PRBool encrypt)
/* XXX unfortunately, this is not defined in blapi.h */
SECStatus
md2_HashBuf(unsigned char *dest, const unsigned char *src, uint32 src_length)
md2_HashBuf(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
unsigned int len;
MD2Context *cx = MD2_NewContext();
......@@ -1694,7 +1694,7 @@ md2_HashBuf(unsigned char *dest, const unsigned char *src, uint32 src_length)
}
SECStatus
md2_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
md2_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
MD2Context *cx, *cx_cpy;
unsigned char *cxbytes;
......@@ -1732,7 +1732,7 @@ finish:
}
SECStatus
md5_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
md5_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
MD5Context *cx, *cx_cpy;
......@@ -1771,7 +1771,7 @@ finish:
}
SECStatus
sha1_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
sha1_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
SHA1Context *cx, *cx_cpy;
......@@ -1810,7 +1810,7 @@ finish:
}
SECStatus
SHA224_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
SHA224_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
SHA224Context *cx, *cx_cpy;
......@@ -1850,7 +1850,7 @@ finish:
}
SECStatus
SHA256_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
SHA256_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
SHA256Context *cx, *cx_cpy;
......@@ -1889,7 +1889,7 @@ finish:
}
SECStatus
SHA384_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
SHA384_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
SHA384Context *cx, *cx_cpy;
......@@ -1928,7 +1928,7 @@ finish:
}
SECStatus
SHA512_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
SHA512_restart(unsigned char *dest, const unsigned char *src, PRUint32 src_length)
{
SECStatus rv = SECSuccess;
SHA512Context *cx, *cx_cpy;
......@@ -2868,7 +2868,7 @@ get_mode(const char *modestring)
}
void
load_file_data(PRArenaPool *arena, bltestIO *data,
load_file_data(PLArenaPool *arena, bltestIO *data,
char *fn, bltestIOMode ioMode)
{
PRFileDesc *file;
......@@ -2882,7 +2882,7 @@ load_file_data(PRArenaPool *arena, bltestIO *data,
}
void
get_params(PRArenaPool *arena, bltestParams *params,
get_params(PLArenaPool *arena, bltestParams *params,
bltestCipherMode mode, int j)
{
char filename[256];
......@@ -3052,7 +3052,7 @@ blapi_selftest(bltestCipherMode *modes, int numModes, int inoff, int outoff,
char *modestr;
char filename[256];
PRFileDesc *file;
PRArenaPool *arena;
PLArenaPool *arena;
SECItem item;
PRBool finished;
SECStatus rv = SECSuccess, srv;
......@@ -3229,7 +3229,7 @@ SECStatus
dump_file(bltestCipherMode mode, char *filename)
{
bltestIO keydata;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
arena = PORT_NewArena(BLTEST_DEFAULT_CHUNKSIZE);
if (mode == bltestRSA) {
RSAPrivateKey *key;
......@@ -3842,7 +3842,7 @@ int main(int argc, char **argv)
PRFileDesc *file = NULL, *infile;
bltestParams *params;
char *instr = NULL;
PRArenaPool *arena;
PLArenaPool *arena;
if (curThrdNum > 0) {
bltestCipherInfo *newCInfo = PORT_ZNew(bltestCipherInfo);
......
......@@ -643,11 +643,11 @@ get_serial_number(Pair *data)
typedef SECStatus (* EXTEN_VALUE_ENCODER)
(PRArenaPool *extHandle, void *value, SECItem *encodedValue);
(PLArenaPool *extHandle, void *value, SECItem *encodedValue);
static SECStatus
EncodeAndAddExtensionValue(
PRArenaPool *arena,
PLArenaPool *arena,
void *extHandle,
void *value,
PRBool criticality,
......@@ -713,10 +713,10 @@ static CERTOidSequence *
CreateOidSequence(void)
{
CERTOidSequence *rv = (CERTOidSequence *)NULL;
PRArenaPool *arena = (PRArenaPool *)NULL;
PLArenaPool *arena = (PLArenaPool *)NULL;
arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
if( (PRArenaPool *)NULL == arena ) {
if( (PLArenaPool *)NULL == arena ) {
goto loser;
}
......@@ -734,7 +734,7 @@ CreateOidSequence(void)
return rv;
loser:
if( (PRArenaPool *)NULL != arena ) {
if( (PLArenaPool *)NULL != arena ) {
PORT_FreeArena(arena, PR_FALSE);
}
......@@ -941,7 +941,7 @@ AddAuthKeyID (void *extHandle,
CERTCertDBHandle *handle)
{
CERTAuthKeyID *authKeyID = NULL;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
CERTCertificate *issuerCert = NULL;
CERTGeneralName *genNames;
......@@ -1013,7 +1013,7 @@ AddPrivKeyUsagePeriod(void *extHandle,
{
char *notBeforeStr;
char *notAfterStr;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
CERTPrivKeyUsagePeriod *pkup;
......@@ -1471,7 +1471,7 @@ string_to_binary(char *string)
static SECStatus
MakeGeneralName(char *name,
CERTGeneralName *genName,
PRArenaPool *arena)
PLArenaPool *arena)
{
SECItem *oid;
SECOidData *oidData;
......@@ -1611,7 +1611,7 @@ MakeGeneralName(char *name,
static CERTGeneralName *
MakeAltName(Pair *data,
char *which,
PRArenaPool *arena)
PLArenaPool *arena)
{
CERTGeneralName *SubAltName;
CERTGeneralName *current;
......@@ -1672,7 +1672,7 @@ MakeAltName(Pair *data,
static CERTNameConstraints *
MakeNameConstraints(Pair *data,
PRArenaPool *arena)
PLArenaPool *arena)
{
CERTNameConstraints *NameConstraints;
CERTNameConstraint *current = NULL;
......@@ -1794,7 +1794,7 @@ AddAltName(void *extHandle,
int type)
{
PRBool autoIssuer = PR_FALSE;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTGeneralName *genName = NULL;
char *which = NULL;
char *name = NULL;
......@@ -1864,7 +1864,7 @@ static SECStatus
AddNameConstraints(void *extHandle,
Pair *data)
{
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTNameConstraints *constraints = NULL;
SECStatus rv = SECSuccess;
......@@ -2111,7 +2111,7 @@ SignCert(CERTCertificate *cert,
SECItem der;
SECKEYPrivateKey *caPrivateKey = NULL;
SECStatus rv;
PRArenaPool *arena;
PLArenaPool *arena;
SECOidTag algID;
if (which_key == 0) {
......
......@@ -78,7 +78,7 @@ PrintChoicesAndGetAnswer(char* str, char* rBuff, int rSize)
}
static CERTGeneralName *
GetGeneralName(PRArenaPool *arena, CERTGeneralName *useExistingName, PRBool onlyOne)
GetGeneralName(PLArenaPool *arena, CERTGeneralName *useExistingName, PRBool onlyOne)
{
CERTGeneralName *namesList = NULL;
CERTGeneralName *current;
......@@ -214,13 +214,13 @@ GetGeneralName(PRArenaPool *arena, CERTGeneralName *useExistingName, PRBool only
}
static CERTGeneralName *
CreateGeneralName(PRArenaPool *arena)
CreateGeneralName(PLArenaPool *arena)
{
return GetGeneralName(arena, NULL, PR_FALSE);
}
static SECStatus
GetString(PRArenaPool *arena, char *prompt, SECItem *value)
GetString(PLArenaPool *arena, char *prompt, SECItem *value)
{
char buffer[251];
char *buffPrt;
......@@ -378,10 +378,10 @@ static CERTOidSequence *
CreateOidSequence(void)
{
CERTOidSequence *rv = (CERTOidSequence *)NULL;
PRArenaPool *arena = (PRArenaPool *)NULL;
PLArenaPool *arena = (PLArenaPool *)NULL;
arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
if( (PRArenaPool *)NULL == arena ) {
if( (PLArenaPool *)NULL == arena ) {
goto loser;
}
......@@ -399,7 +399,7 @@ CreateOidSequence(void)
return rv;
loser:
if( (PRArenaPool *)NULL != arena ) {
if( (PLArenaPool *)NULL != arena ) {
PORT_FreeArena(arena, PR_FALSE);
}
......@@ -666,7 +666,7 @@ AddNscpCertType (void *extHandle, const char *userSuppliedValue)
}
static SECStatus
AddSubjectAltNames(PRArenaPool *arena, CERTGeneralName **existingListp,
AddSubjectAltNames(PLArenaPool *arena, CERTGeneralName **existingListp,
const char *names, CERTGeneralNameType type)
{
CERTGeneralName *nameList = NULL;
......@@ -735,7 +735,7 @@ AddSubjectAltNames(PRArenaPool *arena, CERTGeneralName **existingListp,
}
static SECStatus
AddEmailSubjectAlt(PRArenaPool *arena, CERTGeneralName **existingListp,
AddEmailSubjectAlt(PLArenaPool *arena, CERTGeneralName **existingListp,
const char *emailAddrs)
{
return AddSubjectAltNames(arena, existingListp, emailAddrs,
......@@ -743,7 +743,7 @@ AddEmailSubjectAlt(PRArenaPool *arena, CERTGeneralName **existingListp,
}
static SECStatus
AddDNSSubjectAlt(PRArenaPool *arena, CERTGeneralName **existingListp,
AddDNSSubjectAlt(PLArenaPool *arena, CERTGeneralName **existingListp,
const char *dnsNames)
{
return AddSubjectAltNames(arena, existingListp, dnsNames, certDNSName);
......@@ -784,7 +784,7 @@ AddBasicConstraint(void *extHandle)
static SECStatus
AddNameConstraints(void *extHandle)
{
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTNameConstraints *constraints = NULL;
CERTNameConstraint *current = NULL;
......@@ -879,7 +879,7 @@ static SECStatus
AddAuthKeyID (void *extHandle)
{
CERTAuthKeyID *authKeyID = NULL;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
PRBool yesNoAns;
......@@ -932,7 +932,7 @@ static SECStatus
AddSubjKeyID (void *extHandle)
{
SECItem keyID;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
PRBool yesNoAns;
......@@ -968,7 +968,7 @@ AddSubjKeyID (void *extHandle)
static SECStatus
AddCrlDistPoint(void *extHandle)
{
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTCrlDistributionPoints *crlDistPoints = NULL;
CRLDistributionPoint *current;
SECStatus rv = SECSuccess;
......@@ -1109,7 +1109,7 @@ static SECStatus
AddPolicyConstraints(void *extHandle)
{
CERTCertificatePolicyConstraints *policyConstr;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
SECItem *item, *dummy;
char buffer[512];
......@@ -1193,7 +1193,7 @@ static SECStatus
AddInhibitAnyPolicy(void *extHandle)
{
CERTCertificateInhibitAny certInhibitAny;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
SECItem *item, *dummy;
char buffer[10];
......@@ -1242,7 +1242,7 @@ AddPolicyMappings(void *extHandle)
{
CERTPolicyMap **policyMapArr = NULL;
CERTPolicyMap *current;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
int count = 0;
char buffer[512];
......@@ -1334,7 +1334,7 @@ enum PoliciQualifierEnum {
static CERTPolicyQualifier **
RequestPolicyQualifiers(PRArenaPool *arena, SECItem *policyID)
RequestPolicyQualifiers(PLArenaPool *arena, SECItem *policyID)
{
CERTPolicyQualifier **policyQualifArr = NULL;
CERTPolicyQualifier *current;
......@@ -1529,7 +1529,7 @@ AddCertPolicies(void *extHandle)
{
CERTPolicyInfo **certPoliciesArr = NULL;
CERTPolicyInfo *current;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
int count = 0;
char buffer[512];
......@@ -1626,7 +1626,7 @@ AddInfoAccess(void *extHandle, PRBool addSIAExt, PRBool isCACert)
{
CERTAuthInfoAccess **infoAccArr = NULL;
CERTAuthInfoAccess *current;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
int count = 0;
char buffer[512];
......@@ -1865,7 +1865,7 @@ AddExtensions(void *extHandle, const char *emailAddrs, const char *dnsNames,
}
if (emailAddrs || dnsNames) {
PRArenaPool *arena;
PLArenaPool *arena;
CERTGeneralName *namelist = NULL;
SECItem item = { 0, NULL, 0 };
......
......@@ -51,7 +51,7 @@ GetCertRequest(const SECItem *reqDER)
{
CERTCertificateRequest *certReq = NULL;
CERTSignedData signedData;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv;
do {
......@@ -190,7 +190,7 @@ CertReq(SECKEYPrivateKey *privk, SECKEYPublicKey *pubk, KeyType keyType,
SECItem *encoding;
SECOidTag signAlgTag;
SECStatus rv;
PRArenaPool *arena;
PLArenaPool *arena;
void *extHandle;
SECItem signedReq = { siBuffer, NULL, 0 };
......@@ -601,7 +601,7 @@ ValidateCert(CERTCertDBHandle *handle, char *name, char *date,
{
SECStatus rv;
CERTCertificate *cert = NULL;
int64 timeBoundary;
PRTime timeBoundary;
SECCertificateUsage usage;
CERTVerifyLog reallog;
CERTVerifyLog *log = NULL;
......@@ -1720,7 +1720,7 @@ SignCert(CERTCertDBHandle *handle, CERTCertificate *cert, PRBool selfsign,
SECItem der;
SECKEYPrivateKey *caPrivateKey = NULL;
SECStatus rv;
PRArenaPool *arena;
PLArenaPool *arena;
SECOidTag algID;
void *dummy;
......
......@@ -205,7 +205,7 @@ decode_pqg_params(const char *str)
{
char *buf;
unsigned int len;
PRArenaPool *arena;
PLArenaPool *arena;
SECKEYPQGParams *params;
SECStatus status;
......
......@@ -201,7 +201,7 @@ OurVerifySignedData(CERTSignedData *sd, CERTCertificate *cert)
static
CERTCertificate *createEmptyCertificate(void)
{
PRArenaPool *arena = 0;
PLArenaPool *arena = 0;
CERTCertificate *c = 0;
arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
......@@ -232,7 +232,7 @@ int main(int argc, char **argv)
char *progName=0;
PRFileDesc *inFile=0, *issuerCertFile=0;
SECItem derCert, derIssuerCert;
PRArenaPool *arena=0;
PLArenaPool *arena=0;
CERTSignedData *signedData=0;
CERTCertificate *cert=0, *issuerCert=0;
SECKEYPublicKey *rsapubkey=0;
......
......@@ -148,7 +148,7 @@ crlgen_CommitEntryData(PLHashEntry *he, PRIntn i, void *arg)
/* Copy char * datainto allocated in arena SECItem */
static SECStatus
crlgen_SetString(PRArenaPool *arena, const char *dataIn, SECItem *value)
crlgen_SetString(PLArenaPool *arena, const char *dataIn, SECItem *value)
{
SECItem item;
......@@ -166,7 +166,7 @@ crlgen_SetString(PRArenaPool *arena, const char *dataIn, SECItem *value)
/* Creates CERTGeneralName from parsed data for the Authority Key Extension */
static CERTGeneralName *
crlgen_GetGeneralName (PRArenaPool *arena, CRLGENGeneratorData *crlGenData,
crlgen_GetGeneralName (PLArenaPool *arena, CRLGENGeneratorData *crlGenData,
const char *data)
{
CERTGeneralName *namesList = NULL;
......@@ -314,7 +314,7 @@ crlgen_GetGeneralName (PRArenaPool *arena, CRLGENGeneratorData *crlGenData,
/* Creates CERTGeneralName from parsed data for the Authority Key Extension */
static CERTGeneralName *
crlgen_DistinguishedName (PRArenaPool *arena, CRLGENGeneratorData *crlGenData,
crlgen_DistinguishedName (PLArenaPool *arena, CRLGENGeneratorData *crlGenData,
const char *data)
{
CERTName *directoryName = NULL;
......@@ -365,7 +365,7 @@ crlgen_AddAuthKeyID (CRLGENGeneratorData *crlGenData,
{
void *extHandle = NULL;
CERTAuthKeyID *authKeyID = NULL;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
PORT_Assert(dataArr && crlGenData);
......@@ -429,7 +429,7 @@ crlgen_AddIssuerAltNames(CRLGENGeneratorData *crlGenData,
const char **dataArr)
{
CERTGeneralName *nameList = NULL;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
void *extHandle = NULL;
SECStatus rv = SECSuccess;
......@@ -489,7 +489,7 @@ crlgen_AddIssuerAltNames(CRLGENGeneratorData *crlGenData,
static SECStatus
crlgen_AddCrlNumber(CRLGENGeneratorData *crlGenData, const char **dataArr)
{
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECItem encodedItem;
void *extHandle = crlGenData->crlExtHandle;
void *dummy;
......@@ -540,7 +540,7 @@ crlgen_AddCrlNumber(CRLGENGeneratorData *crlGenData, const char **dataArr)
/* Creates Cert Revocation Reason code extension. Encodes it and
* returns as SECItem structure */
static SECItem*
crlgen_CreateReasonCode(PRArenaPool *arena, const char **dataArr,
crlgen_CreateReasonCode(PLArenaPool *arena, const char **dataArr,
int *extCode)
{
SECItem *encodedItem;
......@@ -590,7 +590,7 @@ crlgen_CreateReasonCode(PRArenaPool *arena, const char **dataArr,
/* Creates Cert Invalidity Date extension. Encodes it and
* returns as SECItem structure */
static SECItem*
crlgen_CreateInvalidityDate(PRArenaPool *arena, const char **dataArr,
crlgen_CreateInvalidityDate(PLArenaPool *arena, const char **dataArr,
int *extCode)
{
SECItem *encodedItem;
......@@ -634,7 +634,7 @@ crlgen_CreateInvalidityDate(PRArenaPool *arena, const char **dataArr,
static SECStatus
crlgen_AddEntryExtension(CRLGENGeneratorData *crlGenData,
const char **dataArr, char *extName,
SECItem* (*extCreator)(PRArenaPool *arena,
SECItem* (*extCreator)(PLArenaPool *arena,
const char **dataArr,
int *extCode))
{
......@@ -643,7 +643,7 @@ crlgen_AddEntryExtension(CRLGENGeneratorData *crlGenData,
int extCode = 0;
PRUint64 lastRange ;
SECItem *ext = NULL;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
PORT_Assert(crlGenData && dataArr);
......@@ -719,7 +719,7 @@ CRLGEN_CommitExtensionsAndEntries(CRLGENGeneratorData *crlGenData)
{
int size = 0;
CERTCrl *crl;
PRArenaPool *arena;
PLArenaPool *arena;
SECStatus rv = SECSuccess;
void *mark;
......@@ -898,7 +898,7 @@ crlgen_SetTimeField(CRLGENGeneratorData *crlGenData, char *value,
PRBool setThisUpdate)
{
CERTSignedCrl *signCrl;
PRArenaPool *arena;
PLArenaPool *arena;
CERTCrl *crl;
int length = 0;
SECItem *timeDest = NULL;
......@@ -987,7 +987,7 @@ crlgen_AddCert(CRLGENGeneratorData *crlGenData,
{
CERTSignedCrl *signCrl;