Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/sdb.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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 671 matching lines @@
                                 SDBFind **find)
 {
     SDBPrivate *sdb_p = sdb->private;
     sqlite3  *sqlDB = NULL;
     const char *table;
     char *newStr, *findStr = NULL;
     sqlite3_stmt *findstmt = NULL;
     char *join="";
     int sqlerr = SQLITE_OK;
     CK_RV error = CKR_OK;
-    int i;
+    unsigned int i;
 
     LOCK_SQLITE()
     *find = NULL;
     error = sdb_openDBLocal(sdb_p, &sqlDB, &table);
     if (error != CKR_OK) {
         goto loser;
     }
 
     findStr = sqlite3_mprintf("");
     for (i=0; findStr && i < count; i++) {
@@ skipping 126 matching lines @@
     SDBPrivate *sdb_p = sdb->private;
     sqlite3  *sqlDB = NULL;
     sqlite3_stmt *stmt = NULL;
     char *getStr = NULL;
     char *newStr = NULL;
     const char *table = NULL;
     int sqlerr = SQLITE_OK;
     CK_RV error = CKR_OK;
     int found = 0;
     int retry = 0;
-    int i;
+    unsigned int i;
 
 
     /* open a new db if necessary */
     error = sdb_openDBLocal(sdb_p, &sqlDB, &table);
     if (error != CKR_OK) {
         goto loser;
     }
 
     for (i=0; i < count; i++) {
         getStr = sqlite3_mprintf("a%x", template[i].type);
@@ skipping 22 matching lines @@
 
         sqlerr = sqlite3_bind_int(stmt, 1, object_id);
         if (sqlerr != SQLITE_OK) { goto loser; }
 
         do {
             sqlerr = sqlite3_step(stmt);
             if (sqlerr == SQLITE_BUSY) {
                 PR_Sleep(SDB_BUSY_RETRY_TIME);
             }
             if (sqlerr == SQLITE_ROW) {
-                int blobSize;
+                unsigned int blobSize;
                 const char *blobData;
 
                 blobSize = sqlite3_column_bytes(stmt, 0);
                 blobData = sqlite3_column_blob(stmt, 0);
                 if (blobData == NULL) {
                     template[i].ulValueLen = -1;
                     error = CKR_ATTRIBUTE_TYPE_INVALID; 
                     break;
                 }
                 /* If the blob equals our explicit NULL value, then the 
@@ skipping 63 matching lines @@
                         const CK_ATTRIBUTE *template, CK_ULONG count)
 {
     SDBPrivate *sdb_p = sdb->private;
     sqlite3  *sqlDB = NULL;
     sqlite3_stmt *stmt = NULL;
     char *setStr = NULL;
     char *newStr = NULL;
     int sqlerr = SQLITE_OK;
     int retry = 0;
     CK_RV error = CKR_OK;
-    int i;
+    unsigned int i;
 
     if ((sdb->sdb_flags & SDB_RDONLY) != 0) {
         return CKR_TOKEN_WRITE_PROTECTED;
     }
 
     if (count == 0) {
         return CKR_OK;
     }
 
     LOCK_SQLITE()  
@@ skipping 131 matching lines @@
     SDBPrivate *sdb_p = sdb->private;
     sqlite3  *sqlDB = NULL;
     sqlite3_stmt *stmt = NULL;
     char *columnStr = NULL;
     char *valueStr = NULL;
     char *newStr = NULL;
     int sqlerr = SQLITE_OK;
     CK_RV error = CKR_OK;
     CK_OBJECT_HANDLE this_object = CK_INVALID_HANDLE;
     int retry = 0;
-    int i;
+    unsigned int i;
 
     if ((sdb->sdb_flags & SDB_RDONLY) != 0) {
         return CKR_TOKEN_WRITE_PROTECTED;
     }
 
     LOCK_SQLITE()  
     if ((*object_id != CK_INVALID_HANDLE) && 
                 !sdb_objectExists(sdb, *object_id)) {
         this_object = *object_id;
     } else {
@@ skipping 949 matching lines @@
 s_shutdown()
 {
 #ifdef SQLITE_UNSAFE_THREADS
     if (sqlite_lock) {
         PR_DestroyLock(sqlite_lock);
         sqlite_lock = NULL;
     }
 #endif
     return CKR_OK;
 }