Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/softoken/ecdecode.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/. */
 
 #ifdef NSS_ENABLE_ECC
 
 #include "blapi.h"
 #include "secoid.h"
 #include "secitem.h"
 #include "secerr.h"
 #include "ec.h"
 #include "ecl-curve.h"
 
 #define CHECK_OK(func) if (func == NULL) goto cleanup
 #define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
 
 /*
  * Initializes a SECItem from a hexadecimal string
  *
  * Warning: This function ignores leading 00's, so any leading 00's
  * in the hexadecimal string must be optional.
  */
 static SECItem *
-hexString2SECItem(PRArenaPool *arena, SECItem *item, const char *str)
+hexString2SECItem(PLArenaPool *arena, SECItem *item, const char *str)
 {
     int i = 0;
     int byteval = 0;
     int tmp = PORT_Strlen(str);
 
     if ((tmp % 2) != 0) return NULL;
     
     /* skip leading 00's unless the hex string is "00" */
     while ((tmp > 2) && (str[0] == '0') && (str[1] == '0')) {
         str += 2;
@@ skipping 21 matching lines @@
         }
         i++;
     }
 
     return item;
 }
 
 /* Copy all of the fields from srcParams into dstParams
  */
 SECStatus
-EC_CopyParams(PRArenaPool *arena, ECParams *dstParams,
+EC_CopyParams(PLArenaPool *arena, ECParams *dstParams,
               const ECParams *srcParams)
 {
     SECStatus rv = SECFailure;
 
     dstParams->arena = arena;
     dstParams->type = srcParams->type;
     dstParams->fieldID.size = srcParams->fieldID.size;
     dstParams->fieldID.type = srcParams->fieldID.type;
     if (srcParams->fieldID.type == ec_field_GFp) {
         CHECK_SEC_OK(SECITEM_CopyItem(arena, &dstParams->fieldID.u.prime,
@@ skipping 63 matching lines @@
         curveParams->order));
     params->cofactor = curveParams->cofactor;
 
     rv = SECSuccess;
 
 cleanup:
     return rv;
 }
 
 SECStatus
-EC_FillParams(PRArenaPool *arena, const SECItem *encodedParams, 
+EC_FillParams(PLArenaPool *arena, const SECItem *encodedParams,
     ECParams *params)
 {
     SECStatus rv = SECFailure;
     SECOidTag tag;
     SECItem oid = { siBuffer, NULL, 0};
 
 #if EC_DEBUG
     int i;
 
     printf("Encoded params in EC_DecodeParams: ");
@@ skipping 403 matching lines @@
         printf("Unrecognized curve, returning NULL params\n");
 #endif
     }
 
     return rv;
 }
 
 SECStatus
 EC_DecodeParams(const SECItem *encodedParams, ECParams **ecparams)
 {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     ECParams *params;
     SECStatus rv = SECFailure;
 
     /* Initialize an arena for the ECParams structure */
     if (!(arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE)))
         return SECFailure;
 
     params = (ECParams *)PORT_ArenaZAlloc(arena, sizeof(ECParams));
     if (!params) {
         PORT_FreeArena(arena, PR_TRUE);
@@ skipping 12 matching lines @@
     if (rv == SECFailure) {
         PORT_FreeArena(arena, PR_TRUE); 
         return SECFailure;
     } else {
         *ecparams = params;;
         return SECSuccess;
     }
 }
 
 #endif /* NSS_ENABLE_ECC */