Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/softoken/sftkdb.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/. */
 /* 
  *  The following code handles the storage of PKCS 11 modules used by the
  * NSS. For the rest of NSS, only one kind of database handle exists:
  *
  *     SFTKDBHandle
  *
  * There is one SFTKDBHandle for the each key database and one for each cert 
@@ skipping 551 matching lines @@
     if (inPeerDBTransaction) {
         /* The transaction must have failed. Abort. */
         (*keyTarget->sdb_Abort)(keyTarget);
         PORT_Assert(crv != CKR_OK);
         if (crv == CKR_OK) crv = CKR_GENERAL_ERROR;
     }
     return crv;
 }
 
 static CK_RV
-sftkdb_CreateObject(PRArenaPool *arena, SFTKDBHandle *handle, 
+sftkdb_CreateObject(PLArenaPool *arena, SFTKDBHandle *handle,
         SDB *db, CK_OBJECT_HANDLE *objectID,
         CK_ATTRIBUTE *template, CK_ULONG count)
 {
     PRBool inTransaction = PR_FALSE;
     CK_RV crv;
 
     inTransaction = PR_TRUE;
     
     crv = (*db->sdb_CreateObject)(db, objectID, template, count);
     if (crv != CKR_OK) {
@@ skipping 426 matching lines @@
  *
  * NOTE: we must update the template or return an error, or the update caller 
  * will loop forever!
  *
  * Two copies of the source code for this algorithm exist in NSS.  
  * Changes must be made in both copies.
  * The other copy is in pk11_IncrementNickname() in pk11wrap/pk11merge.c.
  *
  */
 static CK_RV
-sftkdb_resolveConflicts(PRArenaPool *arena, CK_OBJECT_CLASS objectType, 
+sftkdb_resolveConflicts(PLArenaPool *arena, CK_OBJECT_CLASS objectType,
                         CK_ATTRIBUTE *ptemplate, CK_ULONG *plen)
 {
     CK_ATTRIBUTE *attr;
     char *nickname, *newNickname;
     int end, digit;
 
     /* sanity checks. We should never get here with these errors */
     if (objectType != CKO_CERTIFICATE) {
         return CKR_GENERAL_ERROR; /* shouldn't happen */
     }
@@ skipping 51 matching lines @@
     PORT_Memset(&newNickname[end+1],'0',attr->ulValueLen - end);
     attr->pValue = newNickname;
     attr->ulValueLen++;
     return CKR_OK;
 }
 
 /*
  * set an attribute and sign it if necessary
  */
 static CK_RV
-sftkdb_setAttributeValue(PRArenaPool *arena, SFTKDBHandle *handle, 
+sftkdb_setAttributeValue(PLArenaPool *arena, SFTKDBHandle *handle,
         SDB *db, CK_OBJECT_HANDLE objectID, const CK_ATTRIBUTE *template, 
         CK_ULONG count)
 {
     CK_RV crv;
     crv = (*db->sdb_SetAttributeValue)(db, objectID, template, count);
     if (crv != CKR_OK) {
         return crv;
     }
     crv = sftk_signTemplate(arena, handle, db == handle->update, 
                                 objectID, template, count);
@@ skipping 626 matching lines @@
  *  This code also handles the following corner cases:
  *   1) the single byte overflows. On overflow we increment the next byte up 
  *    and so forth until we have overflowed the entire CKA_ID.
  *   2) If we overflow the entire CKA_ID we expand it by one byte.
  *   3) the CKA_ID is non-existant, we create a new one with one byte.
  *    This means no matter what CKA_ID is passed, the result of this function 
  *    is always a new CKA_ID, and this function will never return the same 
  *    CKA_ID the it has returned in the passed.
  */
 static CK_RV
-sftkdb_incrementCKAID(PRArenaPool *arena, CK_ATTRIBUTE *ptemplate)
+sftkdb_incrementCKAID(PLArenaPool *arena, CK_ATTRIBUTE *ptemplate)
 {
     unsigned char *buf = ptemplate->pValue;
     CK_ULONG len = ptemplate->ulValueLen;
 
     if (buf == NULL || len == (CK_ULONG)-1) {
         /* we have no valid CKAID, we'll create a basic one byte CKA_ID below */
         len = 0;
     } else {
         CK_ULONG i;
 
@@ skipping 73 matching lines @@
  *       return SFTKDB_MODIFY_OBJECT
  *   If we want to use the target version,
  *       return SFTKDB_DROP_ATTRIBUTE
  *
  *   In the end the caller will remove any attributes in the source
  *   template when SFTKDB_DROP_ATTRIBUTE is specified, then use do a 
  *   set attributes with that template on the target if we received 
  *   any SFTKDB_MODIFY_OBJECT returns.
  */
 sftkdbUpdateStatus
-sftkdb_reconcileTrustEntry(PRArenaPool *arena, CK_ATTRIBUTE *target, 
+sftkdb_reconcileTrustEntry(PLArenaPool *arena, CK_ATTRIBUTE *target,
                            CK_ATTRIBUTE *source)
 {
     CK_ULONG targetTrust = sftkdb_getULongFromTemplate(target->type,
                         target, 1);
     CK_ULONG sourceTrust = sftkdb_getULongFromTemplate(target->type,
                         source, 1);
 
     /*
      * try to pick the best solution between the source and the
      * target. Update the source template if we want the target value
@@ skipping 66 matching lines @@
           CKA_TRUST_TIME_STAMPING };
 
 #define SFTK_TRUST_TEMPLATE_COUNT \
                 (sizeof(sftkdb_trustList)/sizeof(sftkdb_trustList[0]))
 /*
  * Run through the list of known trust types, and reconcile each trust
  * entry one by one. Keep track of we really need to write out the source
  * trust object (overwriting the existing one).
  */
 static sftkdbUpdateStatus
-sftkdb_reconcileTrust(PRArenaPool *arena, SDB *db, CK_OBJECT_HANDLE id, 
+sftkdb_reconcileTrust(PLArenaPool *arena, SDB *db, CK_OBJECT_HANDLE id,
                       CK_ATTRIBUTE *ptemplate, CK_ULONG *plen)
 {
     CK_ATTRIBUTE trustTemplate[SFTK_TRUST_TEMPLATE_COUNT];
     unsigned char trustData[SFTK_TRUST_TEMPLATE_COUNT*SDB_ULONG_SIZE];
     sftkdbUpdateStatus update = SFTKDB_DO_NOTHING;
     CK_ULONG i;
     CK_RV crv;
 
 
     for (i=0; i < SFTK_TRUST_TEMPLATE_COUNT;  i++) {
@@ skipping 65 matching lines @@
                         (*(CK_BBOOL *)(attr->pValue) == CK_TRUE)) {
                 update = SFTKDB_MODIFY_OBJECT;
         }
     }
     
 done:
     return update;
 }
 
 static sftkdbUpdateStatus
-sftkdb_handleIDAndName(PRArenaPool *arena, SDB *db, CK_OBJECT_HANDLE id, 
+sftkdb_handleIDAndName(PLArenaPool *arena, SDB *db, CK_OBJECT_HANDLE id,
                       CK_ATTRIBUTE *ptemplate, CK_ULONG *plen)
 {
     sftkdbUpdateStatus update = SFTKDB_DO_NOTHING;
     CK_ATTRIBUTE *attr1, *attr2;
     CK_ATTRIBUTE ttemplate[2] = {
         {CKA_ID, NULL, 0},
         {CKA_LABEL, NULL, 0}
     };
     CK_RV crv;
 
@@ skipping 58 matching lines @@
                 
 /*
  * This function updates the template before we write the object out.
  *
  * If we are going to skip updating this object, return PR_FALSE.
  * If it should be updated we return PR_TRUE.
  * To help readability, these have been defined 
  * as SFTK_DONT_UPDATE and SFTK_UPDATE respectively.
  */
 static PRBool
-sftkdb_updateObjectTemplate(PRArenaPool *arena, SDB *db, 
+sftkdb_updateObjectTemplate(PLArenaPool *arena, SDB *db,
                     CK_OBJECT_CLASS objectType, 
                     CK_ATTRIBUTE *ptemplate, CK_ULONG *plen,
                     CK_OBJECT_HANDLE *targetID)
 {
     PRBool done; /* should we repeat the loop? */
     CK_OBJECT_HANDLE id;
     CK_RV crv = CKR_OK;
 
     do {
         crv = sftkdb_checkConflicts(db, objectType, ptemplate, 
@@ skipping 633 matching lines @@
 }
 
 CK_RV 
 sftkdb_Shutdown(void)
 {
   s_shutdown();
   sftkdbCall_Shutdown();
   return CKR_OK;
 }