Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11pqg.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/. */
 /* Thse functions are stub functions which will get replaced with calls through
  * PKCS #11.
  */
 
 #include "pk11func.h"
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 46 matching lines @@
     };
     CK_ATTRIBUTE vTemplate[] = {
         { CKA_NETSCAPE_PQG_COUNTER, NULL, 0 },
         { CKA_NETSCAPE_PQG_SEED, NULL, 0 },
         { CKA_NETSCAPE_PQG_H, NULL, 0 },
     };
     CK_ULONG primeBits = L;
     CK_ULONG subPrimeBits = N;
     int pTemplateCount = sizeof(pTemplate)/sizeof(pTemplate[0]);
     int vTemplateCount = sizeof(vTemplate)/sizeof(vTemplate[0]);
-    PRArenaPool *parena = NULL;
-    PRArenaPool *varena = NULL;
+    PLArenaPool *parena = NULL;
+    PLArenaPool *varena = NULL;
     PQGParams *params = NULL;
     PQGVerify *verify = NULL;
     CK_ULONG seedBits = seedBytes*8;
 
     *pParams = NULL;
     *pVfy =  NULL;
 
     if (primeBits == (CK_ULONG)-1) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         goto loser;
@@ skipping 293 matching lines @@
 #define PQG_DEFAULT_CHUNKSIZE 2048      /* bytes */
 
 /**************************************************************************
  *  Return a pointer to a new PQGParams struct that is constructed from   *
  *  copies of the arguments passed in.                                    *
  *  Return NULL on failure.                                               *
  **************************************************************************/
 extern PQGParams *
 PK11_PQG_NewParams(const SECItem * prime, const SECItem * subPrime, 
                                                 const SECItem * base) {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     PQGParams *dest;
     SECStatus status;
 
     arena = PORT_NewArena(PQG_DEFAULT_CHUNKSIZE);
     if (arena == NULL)
         goto loser;
 
     dest = (PQGParams*)PORT_ArenaZAlloc(arena, sizeof(PQGParams));
     if (dest == NULL)
         goto loser;
@@ skipping 52 matching lines @@
 
 
 /**************************************************************************
  *  Return a pointer to a new PQGVerify struct that is constructed from   *
  *  copies of the arguments passed in.                                    *
  *  Return NULL on failure.                                               *
  **************************************************************************/
 extern PQGVerify *
 PK11_PQG_NewVerify(unsigned int counter, const SECItem * seed, 
                                                         const SECItem * h) {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     PQGVerify *  dest;
     SECStatus    status;
 
     arena = PORT_NewArena(PQG_DEFAULT_CHUNKSIZE);
     if (arena == NULL)
         goto loser;
 
     dest = (PQGVerify*)PORT_ArenaZAlloc(arena, sizeof(PQGVerify));
     if (dest == NULL)
         goto loser;
@@ skipping 37 matching lines @@
 
 
 /**************************************************************************
  * Fills in caller's "h" SECItem with the h value in verify.
  * Contents can be freed by calling SECITEM_FreeItem(h, PR_FALSE);      
  **************************************************************************/
 extern SECStatus 
 PK11_PQG_GetHFromVerify(const PQGVerify *verify, SECItem * h) {
     return SECITEM_CopyItem(NULL, h, &verify->h);
 }