Update NSS to 3.21 RTM and NSPR to 4.11 RTM

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 307 matching lines @@
     }
 
     for (i=0; i < count; i++) {
         CK_ULONG length = template[i].ulValueLen;
         template[i].ulValueLen = ntemplate[i].ulValueLen;
         /* fixup ulongs */
         if (ntemplate[i].ulValueLen == SDB_ULONG_SIZE) {
             if (sftkdb_isULONGAttribute(template[i].type)) {
                 if (template[i].pValue) {
                     CK_ULONG value;
-                    unsigned char *data;
 
-                    data = (unsigned char *)ntemplate[i].pValue;
                     value = sftk_SDBULong2ULong(ntemplate[i].pValue);
                     if (length < sizeof(CK_ULONG)) {
                         template[i].ulValueLen = -1;
                         crv = CKR_BUFFER_TOO_SMALL;
                         continue;
                     } 
                     PORT_Memcpy(template[i].pValue,&value,sizeof(CK_ULONG));
                 }
                 template[i].ulValueLen = sizeof(CK_ULONG);
             }
@@ skipping 127 matching lines @@
  *
  * The caller is expected to abort any transaction he was in in the
  * event of a failure of this function.
  */
 static CK_RV
 sftk_signTemplate(PLArenaPool *arena, SFTKDBHandle *handle, 
                   PRBool mayBeUpdateDB,
                   CK_OBJECT_HANDLE objectID, const CK_ATTRIBUTE *template,
                   CK_ULONG count)
 {
-    int i;
+    unsigned int i;
     CK_RV crv;
     SFTKDBHandle *keyHandle = handle;
     SDB *keyTarget = NULL;
     PRBool usingPeerDB = PR_FALSE;
     PRBool inPeerDBTransaction = PR_FALSE;
 
     PORT_Assert(handle);
 
     if (handle->type != SFTK_KEYDB_TYPE) {
         keyHandle = handle->peerDB;
@@ skipping 77 matching lines @@
         if (crv == CKR_OK) crv = CKR_GENERAL_ERROR;
     }
     return crv;
 }
 
 static CK_RV
 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) {
         goto loser;
     }
     crv = sftk_signTemplate(arena, handle, (db == handle->update),
                                         *objectID, template, count);
 loser:
 
     return crv;
 }
 
 
 CK_ATTRIBUTE * 
 sftk_ExtractTemplate(PLArenaPool *arena, SFTKObject *object, 
                      SFTKDBHandle *handle,CK_ULONG *pcount, 
                      CK_RV *crv)
 {
-    int count;
+    unsigned int count;
     CK_ATTRIBUTE *template;
-    int i, templateIndex;
+    unsigned int i, templateIndex;
     SFTKSessionObject *sessObject = sftk_narrowToSessionObject(object);
     PRBool doEnc = PR_TRUE;
 
     *crv = CKR_OK;
 
     if (sessObject == NULL) {
         *crv = CKR_GENERAL_ERROR; /* internal programming error */
         return NULL;
     }
 
@@ skipping 403 matching lines @@
  * Changes must be made in both copies.
  * The other copy is in pk11_IncrementNickname() in pk11wrap/pk11merge.c.
  *
  */
 static CK_RV
 sftkdb_resolveConflicts(PLArenaPool *arena, CK_OBJECT_CLASS objectType,
                         CK_ATTRIBUTE *ptemplate, CK_ULONG *plen)
 {
     CK_ATTRIBUTE *attr;
     char *nickname, *newNickname;
-    int end, digit;
+    unsigned int end, digit;
 
     /* sanity checks. We should never get here with these errors */
     if (objectType != CKO_CERTIFICATE) {
         return CKR_GENERAL_ERROR; /* shouldn't happen */
     }
     attr = sftkdb_getAttributeFromTemplate(CKA_LABEL, ptemplate, *plen);
     if ((attr == NULL) || (attr->ulValueLen == 0)) {
         return CKR_GENERAL_ERROR; /* shouldn't happen */
     }
 
@@ skipping 18 matching lines @@
         if (!newNickname) {
             return CKR_HOST_MEMORY;
         }
         PORT_Memcpy(newNickname, nickname, attr->ulValueLen);
         PORT_Memcpy(&newNickname[attr->ulValueLen], num2, sizeof(num2));
         attr->pValue = newNickname; /* modifies ptemplate */
         attr->ulValueLen += 3;      /* 3 is strlen(num2)  */
         return CKR_OK;
     }
 
-    for (end = attr->ulValueLen - 1; 
-         end >= 0 && (digit = nickname[end]) <= '9' &&  digit >= '0'; 
-         end--) {
+    for (end = attr->ulValueLen; end-- > 0;) {
+        digit = nickname[end];
+        if (digit > '9' || digit < '0') {
+            break;
+        }
         if (digit < '9') {
             nickname[end]++;
             return CKR_OK;
         }
         nickname[end] = '0';
     }
 
     /* we overflowed, insert a new '1' for a carry in front of the number */
     newNickname = PORT_ArenaAlloc(arena, attr->ulValueLen + 1);
     if (!newNickname) {
@@ skipping 174 matching lines @@
 
     if (handle == NULL) {
         *count = 0;
         return CKR_OK;
     }
     db = SFTK_GET_SDB(handle);
 
     crv = (*db->sdb_FindObjects)(db, find, ids, 
                                             arraySize, count);
     if (crv == CKR_OK) {
-        int i;
+        unsigned int i;
         for (i=0; i < *count; i++) {
             ids[i] |= (handle->type | SFTK_TOKEN_TYPE);
         }
     }
     return crv;
 }
 
 CK_RV sftkdb_FindObjectsFinal(SFTKDBHandle *handle, SDBFind *find)
 {
     SDB *db;
@@ skipping 322 matching lines @@
     CKA_TRUST_DIGITAL_SIGNATURE, CKA_TRUST_NON_REPUDIATION,
     CKA_TRUST_KEY_ENCIPHERMENT, CKA_TRUST_DATA_ENCIPHERMENT,
     CKA_TRUST_KEY_AGREEMENT, CKA_TRUST_KEY_CERT_SIGN, CKA_TRUST_CRL_SIGN,
     CKA_TRUST_SERVER_AUTH, CKA_TRUST_CLIENT_AUTH, CKA_TRUST_CODE_SIGNING,
     CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_IPSEC_END_SYSTEM,
     CKA_TRUST_IPSEC_TUNNEL, CKA_TRUST_IPSEC_USER, CKA_TRUST_TIME_STAMPING,
     CKA_TRUST_STEP_UP_APPROVED, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH,
     CKA_NETSCAPE_DB, CKA_NETSCAPE_TRUST, CKA_NSS_OVERRIDE_EXTENSIONS
 };
 
-static int known_attributes_size= sizeof(known_attributes)/
+static unsigned int known_attributes_size= sizeof(known_attributes)/
                            sizeof(known_attributes[0]);
 
 static CK_RV
 sftkdb_GetObjectTemplate(SDB *source, CK_OBJECT_HANDLE id,
                 CK_ATTRIBUTE *ptemplate, CK_ULONG *max)
 {
-    int i,j;
+    unsigned int i,j;
     CK_RV crv;
 
     if (*max < known_attributes_size) {
         *max = known_attributes_size;
         return CKR_BUFFER_TOO_SMALL;
     }
     for (i=0; i < known_attributes_size; i++) {
         ptemplate[i].type = known_attributes[i];
         ptemplate[i].pValue = NULL;
         ptemplate[i].ulValueLen = 0;
@@ skipping 383 matching lines @@
 static sftkdbUpdateStatus
 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;
 
     attr1 = sftkdb_getAttributeFromTemplate(CKA_LABEL, ptemplate, *plen);
     attr2 = sftkdb_getAttributeFromTemplate(CKA_ID, ptemplate, *plen);
 
     /* if the source has neither an id nor label, don't bother updating */
     if ( (!attr1 || attr1->ulValueLen == 0) &&
          (! attr2 ||  attr2->ulValueLen == 0) ) {
         return SFTKDB_DO_NOTHING;
     }
 
     /* the source has either an id or a label, see what the target has */
-    crv = (*db->sdb_GetAttributeValue)(db, id, ttemplate, 2);
+    (void)(*db->sdb_GetAttributeValue)(db, id, ttemplate, 2);
 
     /* if the target has neither, update from the source */
     if ( ((ttemplate[0].ulValueLen == 0) || 
           (ttemplate[0].ulValueLen == (CK_ULONG)-1))  &&
          ((ttemplate[1].ulValueLen == 0) || 
           (ttemplate[1].ulValueLen == (CK_ULONG)-1)) ) {
         return SFTKDB_MODIFY_OBJECT;
     }
 
     /* check the CKA_ID */
@@ skipping 124 matching lines @@
 static CK_RV
 sftkdb_mergeObject(SFTKDBHandle *handle, CK_OBJECT_HANDLE id, 
                    SECItem *key)
 {
     CK_ATTRIBUTE template[MAX_ATTRIBUTES];
     CK_ATTRIBUTE *ptemplate;
     CK_ULONG max_attributes = MAX_ATTRIBUTES;
     CK_OBJECT_CLASS objectType;
     SDB *source = handle->update;
     SDB *target = handle->db;
-    int i;
+    unsigned int i;
     CK_RV crv;
     PLArenaPool *arena = NULL;
 
     arena = PORT_NewArena(256);
     if (arena ==  NULL) {
         return CKR_HOST_MEMORY;
     }
 
     ptemplate = &template[0];
     id &= SFTK_OBJ_ID_MASK;
@@ skipping 68 matching lines @@
  */
 CK_RV
 sftkdb_Update(SFTKDBHandle *handle, SECItem *key)
 {
     SDBFind *find = NULL;
     CK_ULONG idCount = MAX_IDS;
     CK_OBJECT_HANDLE ids[MAX_IDS];
     SECItem *updatePasswordKey = NULL;
     CK_RV crv, crv2;
     PRBool inTransaction = PR_FALSE;
-    int i;
+    unsigned int i;
 
     if (handle == NULL) {
         return CKR_OK;
     }
     if (handle->update == NULL) {
         return CKR_OK;
     }
 
     /*
      * put the whole update under a transaction. This allows us to handle
@@ skipping 134 matching lines @@
  * (database for public objects) 
  */
 SFTKDBHandle *
 sftk_getCertDB(SFTKSlot *slot)
 {
     SFTKDBHandle *dbHandle;
 
     PZ_Lock(slot->slotLock);
     dbHandle = slot->certDB;
     if (dbHandle) {
-        PR_ATOMIC_INCREMENT(&dbHandle->ref);
+        (void)PR_ATOMIC_INCREMENT(&dbHandle->ref);
     }
     PZ_Unlock(slot->slotLock);
     return dbHandle;
 }
 
 /*
  * acquire a database handle for a key database 
  * (database for private objects)
  */
 SFTKDBHandle *
 sftk_getKeyDB(SFTKSlot *slot)
 {
     SFTKDBHandle *dbHandle;
 
     SKIP_AFTER_FORK(PZ_Lock(slot->slotLock));
     dbHandle = slot->keyDB;
     if (dbHandle) {
-        PR_ATOMIC_INCREMENT(&dbHandle->ref);
+        (void)PR_ATOMIC_INCREMENT(&dbHandle->ref);
     }
     SKIP_AFTER_FORK(PZ_Unlock(slot->slotLock));
     return dbHandle;
 }
 
 /*
  * acquire the database for a specific object. NOTE: objectID must point
  * to a Token object!
  */
 SFTKDBHandle *
 sftk_getDBForTokenObject(SFTKSlot *slot, CK_OBJECT_HANDLE objectID)
 {
     SFTKDBHandle *dbHandle;
 
     PZ_Lock(slot->slotLock);
     dbHandle = objectID & SFTK_KEYDB_TYPE ? slot->keyDB : slot->certDB;
     if (dbHandle) {
-        PR_ATOMIC_INCREMENT(&dbHandle->ref);
+        (void)PR_ATOMIC_INCREMENT(&dbHandle->ref);
     }
     PZ_Unlock(slot->slotLock);
     return dbHandle;
 }
 
 /*
  * initialize a new database handle
  */
 static SFTKDBHandle *
 sftk_NewDBHandle(SDB *sdb, int type)
@@ skipping 266 matching lines @@
 }
 
 CK_RV 
 sftkdb_Shutdown(void)
 {
   s_shutdown();
   sftkdbCall_Shutdown();
   return CKR_OK;
 }