Adjustments for 64k kdf iterations

Author: developernotes

libs/armeabi/libsqlcipher_android.so

@@ -2,13 +2,26 @@
 
 import android.database.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.zetetic.ZeteticApplication;
 
 import java.io.File;
 import java.io.IOException;
 
 public class AttachExistingDatabaseTest extends SQLCipherTest {
 
+    @Override
+    protected SQLiteDatabase createDatabase(File databasePath) {
+        SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+            public void preKey(SQLiteDatabase database) {}
+            public void postKey(SQLiteDatabase database) {
+                database.execSQL("PRAGMA cipher_default_kdf_iter = 4000;");
+            }
+        };
+        return SQLiteDatabase.openOrCreateDatabase(databasePath,
+                ZeteticApplication.DATABASE_PASSWORD, null, hook);
+    }
+
     @Override
     public boolean execute(SQLiteDatabase database) {
 
@@ -34,9 +47,12 @@ public boolean execute(SQLiteDatabase database) {
         } catch (IOException e) {
             return false;
         }
-        finally {
-            ZeteticApplication.getInstance().delete1xDatabase();
-        }
+    }
+
+    @Override
+    protected void tearDown(SQLiteDatabase database) {
+        ZeteticApplication.getInstance().delete1xDatabase();
+        database.execSQL("PRAGMA cipher_default_kdf_iter = 64000;");
     }
 
     @Override

libs/sqlcipher.jar

@@ -27,7 +27,7 @@ public boolean execute(SQLiteDatabase encryptedDatabase) {
     }
 
     @Override
-    protected void tearDown() {
+    protected void tearDown(SQLiteDatabase database) {
         File newDatabasePath = ZeteticApplication.getInstance().getDatabasePath("normal.db");
         newDatabasePath.delete();
     }

libs/x86/libdatabase_sqlcipher.so

@@ -47,8 +47,7 @@ public void postKey(SQLiteDatabase sqLiteDatabase) {}
     }
 
     @Override
-    protected void tearDown() {
-        super.tearDown();
+    protected void tearDown(SQLiteDatabase database) {
         unencryptedFile.delete();
     }
 

libs/x86/libsqlcipher_android.so

@@ -2,12 +2,25 @@
 
 import android.database.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.zetetic.ZeteticApplication;
 
 import java.io.*;
 
 public class MigrationFromDatabaseFormat1To2 extends SQLCipherTest {
-    
+
+    @Override
+    protected SQLiteDatabase createDatabase(File databasePath) {
+        SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+            public void preKey(SQLiteDatabase database) {}
+            public void postKey(SQLiteDatabase database) {
+                database.execSQL("PRAGMA cipher_default_kdf_iter = 4000;");
+            }
+        };
+        return SQLiteDatabase.openOrCreateDatabase(databasePath,
+                ZeteticApplication.DATABASE_PASSWORD, null, hook);
+    }
+
     @Override
     public boolean execute(SQLiteDatabase database) {
 
@@ -35,6 +48,11 @@ public boolean execute(SQLiteDatabase database) {
         }
     }
 
+    @Override
+    protected void tearDown(SQLiteDatabase database) {
+        database.execSQL("PRAGMA cipher_default_kdf_iter = 64000;");
+    }
+
     @Override
     public String getName() {
         return "Database 1.x to 2 Migration Test";

net.zetetic.sqlcipher.test.iws

@@ -1,15 +1,25 @@
 package net.zetetic.tests;
 
-import android.content.Context;
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteDatabaseHook;
-import net.sqlcipher.database.SQLiteOpenHelper;
 import net.zetetic.ZeteticApplication;
 
 import java.io.File;
 
 public class MigrationUserVersion extends SQLCipherTest {
 
+    @Override
+    protected SQLiteDatabase createDatabase(File databasePath) {
+        SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+            public void preKey(SQLiteDatabase database) {}
+            public void postKey(SQLiteDatabase database) {
+                database.execSQL("PRAGMA cipher_default_kdf_iter = 4000;");
+            }
+        };
+        return SQLiteDatabase.openOrCreateDatabase(databasePath,
+                ZeteticApplication.DATABASE_PASSWORD, null, hook);
+    }
+
     @Override
     public boolean execute(SQLiteDatabase database) {
 
@@ -34,6 +44,11 @@ public void postKey(SQLiteDatabase sqLiteDatabase) {}
         }
     }
 
+    @Override
+    protected void tearDown(SQLiteDatabase database) {
+        database.execSQL("PRAGMA cipher_default_kdf_iter = 64000;");
+    }
+
     @Override
     public String getName() {
         return "Database 1.x - 2 Migration with user_version";