Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/freebl/pqg.c

Index: nss/lib/freebl/pqg.c
===================================================================
--- nss/lib/freebl/pqg.c	(revision 203524)
+++ nss/lib/freebl/pqg.c	(working copy)
@@ -228,8 +228,8 @@
 	return SECFailure;
     }
 
-    L = PQG_GetLength(&params->prime)*BITS_PER_BYTE;
-    N = PQG_GetLength(&params->subPrime)*BITS_PER_BYTE;
+    L = PQG_GetLength(&params->prime)*PR_BITS_PER_BYTE;
+    N = PQG_GetLength(&params->subPrime)*PR_BITS_PER_BYTE;
 
     if (L < 1024) {
 	int j;
@@ -261,8 +261,8 @@
 	return HASH_AlgNULL;
     }
 
-    L = PQG_GetLength(&params->prime)*BITS_PER_BYTE;
-    N = PQG_GetLength(&params->subPrime)*BITS_PER_BYTE;
+    L = PQG_GetLength(&params->prime)*PR_BITS_PER_BYTE;
+    N = PQG_GetLength(&params->subPrime)*PR_BITS_PER_BYTE;
     return getFirstHash(L, N);
 }
 
@@ -271,7 +271,7 @@
 ** global random number generator.
 */
 static SECStatus
-getPQseed(SECItem *seed, PRArenaPool* arena)
+getPQseed(SECItem *seed, PLArenaPool* arena)
 {
     SECStatus rv;
 
@@ -443,7 +443,7 @@
     unsigned char U[HASH_LENGTH_MAX];
     SECStatus rv  = SECSuccess;
     mp_err    err = MP_OKAY;
-    int N_bytes = N/BITS_PER_BYTE; /* length of N in bytes rather than bits */
+    int N_bytes = N/PR_BITS_PER_BYTE; /* length of N in bytes rather than bits */
     int hashLen = HASH_ResultLen(hashtype);
     int offset = 0;
 
@@ -485,7 +485,7 @@
 ** This implments steps 4 thorough 22 of FIPS 186-3 A.1.2.1 and
 **                steps 16 through 34 of FIPS 186-2 C.6
 */
-#define MAX_ST_SEED_BITS HASH_LENGTH_MAX*BITS_PER_BYTE
+#define MAX_ST_SEED_BITS (HASH_LENGTH_MAX*PR_BITS_PER_BYTE)
 SECStatus
 makePrimefromPrimesShaweTaylor(
       HASH_HashType hashtype,	/* selected Hashing algorithm */
@@ -504,7 +504,7 @@
     mp_int two_length_minus_1;
     SECStatus rv = SECFailure;
     int hashlen = HASH_ResultLen(hashtype);
-    int outlen = hashlen*BITS_PER_BYTE;
+    int outlen = hashlen*PR_BITS_PER_BYTE;
     int offset;
     unsigned char bit, mask;
     /* x needs to hold roundup(L/outlen)*outlen.
@@ -580,7 +580,7 @@
     **  iterations=ceiling(length/outlen). First we find the offset in 
     **  bytes into the array where the high bit is.
     */
-    offset = (outlen*iterations - length)/BITS_PER_BYTE;
+    offset = (outlen*iterations - length)/PR_BITS_PER_BYTE;
     /* now we want to set the 'high bit', since length may not be a 
      * multiple of 8,*/
     bit = 1 << ((length-1) & 0x7); /* select the proper bit in the byte */
@@ -734,7 +734,7 @@
     mp_int one;
     SECStatus rv = SECFailure;
     int hashlen = HASH_ResultLen(hashtype);
-    int outlen = hashlen*BITS_PER_BYTE;
+    int outlen = hashlen*PR_BITS_PER_BYTE;
     int offset;
     unsigned char bit, mask;
     unsigned char x[HASH_LENGTH_MAX*2];
@@ -795,7 +795,7 @@
     **  length at this point is 32 bits. So first we find the offset in bytes
     **  into the array where the high bit is.
     */
-    offset = (outlen - length)/BITS_PER_BYTE;
+    offset = (outlen - length)/PR_BITS_PER_BYTE;
     /* now we want to set the 'high bit'. We have to calculate this since 
      * length may not be a multiple of 8.*/
     bit = 1 << ((length-1) & 0x7); /* select the proper bit in the byte */
@@ -1009,7 +1009,7 @@
     CHECK_MPI_OK( mp_init(&V_n)  );
 
     hashlen = HASH_ResultLen(hashtype);
-    outlen = hashlen*BITS_PER_BYTE; 
+    outlen = hashlen*PR_BITS_PER_BYTE;
 
     /* L - 1 = n*outlen + b */
     n = (L - 1) / outlen;
@@ -1237,7 +1237,7 @@
     unsigned int  maxCount;
     HASH_HashType hashtype;
     SECItem      *seed;     /* Per FIPS 186, app 2.2. 186-3 app A.1.1.2 */
-    PRArenaPool  *arena  = NULL;
+    PLArenaPool  *arena  = NULL;
     PQGParams    *params = NULL;
     PQGVerify    *verify = NULL;
     PRBool passed;
@@ -1253,7 +1253,7 @@
 
     /* Step 1. L and N already checked by caller*/
     /* Step 2. if (seedlen < N) return INVALID; */
-    if (seedBytes < N/BITS_PER_BYTE || !pParams || !pVfy) {
+    if (seedBytes < N/PR_BITS_PER_BYTE || !pParams || !pVfy) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return SECFailure;
     }
@@ -1305,13 +1305,13 @@
     /* getFirstHash gives us the smallest acceptable hash for this key
      * strength */
     hashtype = getFirstHash(L,N);
-    outlen = HASH_ResultLen(hashtype)*BITS_PER_BYTE;
+    outlen = HASH_ResultLen(hashtype)*PR_BITS_PER_BYTE;
 
     /* Step 3: n = Ceil(L/outlen)-1; (same as n = Floor((L-1)/outlen)) */
     n = (L - 1) / outlen; 
     /* Step 4: b = L -1 - (n*outlen); (same as n = (L-1) mod outlen) */
     b = (L - 1) % outlen;
-    seedlen = seedBytes * BITS_PER_BYTE;    /* bits in seed */
+    seedlen = seedBytes * PR_BITS_PER_BYTE;    /* bits in seed */
 step_5:
     /* ******************************************************************
     ** Step 5. (Step 1 in 186-1)
@@ -1737,7 +1737,7 @@
     } else {
 	/* 10. P generated from (L, counter, g, SEED, Q) matches P 
 	 * in PQGParams. */
-	outlen = HASH_ResultLen(hashtype)*BITS_PER_BYTE;
+	outlen = HASH_ResultLen(hashtype)*PR_BITS_PER_BYTE;
 	n = (L - 1) / outlen;
 	offset = vfy->counter * (n + 1) + ((type == FIPS186_1_TYPE) ? 2 : 1);
 	CHECK_SEC_OK( makePfromQandSeed(hashtype, L, N, offset, g, &vfy->seed,