Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 802430: Allow NSS to be built with NO_NSPR_10_SUPPORT, r=wtc
  • Loading branch information
Brian Smith committed May 3, 2013
1 parent d2fc8a1 commit 4ee5873
Show file tree
Hide file tree
Showing 191 changed files with 1,059 additions and 1,049 deletions.
2 changes: 1 addition & 1 deletion cmd/addbuiltin/addbuiltin.c
Expand Up @@ -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;

Expand Down
52 changes: 26 additions & 26 deletions cmd/bltest/blapitest.c
Expand Up @@ -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

Expand Down Expand Up @@ -207,7 +207,7 @@ static void Usage()
/* XXX argh */
struct item_with_arena {
SECItem *item;
PRArenaPool *arena;
PLArenaPool *arena;
};

static PRInt32
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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;
Expand Down Expand Up @@ -1732,7 +1732,7 @@ md2_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -1771,7 +1771,7 @@ md5_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -1810,7 +1810,7 @@ sha1_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -1850,7 +1850,7 @@ SHA224_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -1889,7 +1889,7 @@ SHA256_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -1928,7 +1928,7 @@ SHA384_restart(unsigned char *dest, const unsigned char *src, uint32 src_length)
}

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;
Expand Down Expand Up @@ -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;
Expand All @@ -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];
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
26 changes: 13 additions & 13 deletions cmd/certcgi/certcgi.c
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}

Expand All @@ -734,7 +734,7 @@ CreateOidSequence(void)
return rv;

loser:
if( (PRArenaPool *)NULL != arena ) {
if( (PLArenaPool *)NULL != arena ) {
PORT_FreeArena(arena, PR_FALSE);
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1013,7 +1013,7 @@ AddPrivKeyUsagePeriod(void *extHandle,
{
char *notBeforeStr;
char *notAfterStr;
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
SECStatus rv = SECSuccess;
CERTPrivKeyUsagePeriod *pkup;

Expand Down Expand Up @@ -1471,7 +1471,7 @@ string_to_binary(char *string)
static SECStatus
MakeGeneralName(char *name,
CERTGeneralName *genName,
PRArenaPool *arena)
PLArenaPool *arena)
{
SECItem *oid;
SECOidData *oidData;
Expand Down Expand Up @@ -1611,7 +1611,7 @@ MakeGeneralName(char *name,
static CERTGeneralName *
MakeAltName(Pair *data,
char *which,
PRArenaPool *arena)
PLArenaPool *arena)
{
CERTGeneralName *SubAltName;
CERTGeneralName *current;
Expand Down Expand Up @@ -1672,7 +1672,7 @@ MakeAltName(Pair *data,

static CERTNameConstraints *
MakeNameConstraints(Pair *data,
PRArenaPool *arena)
PLArenaPool *arena)
{
CERTNameConstraints *NameConstraints;
CERTNameConstraint *current = NULL;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1864,7 +1864,7 @@ static SECStatus
AddNameConstraints(void *extHandle,
Pair *data)
{
PRArenaPool *arena = NULL;
PLArenaPool *arena = NULL;
CERTNameConstraints *constraints = NULL;
SECStatus rv = SECSuccess;

Expand Down Expand Up @@ -2111,7 +2111,7 @@ SignCert(CERTCertificate *cert,
SECItem der;
SECKEYPrivateKey *caPrivateKey = NULL;
SECStatus rv;
PRArenaPool *arena;
PLArenaPool *arena;
SECOidTag algID;

if (which_key == 0) {
Expand Down

0 comments on commit 4ee5873

Please sign in to comment.