Skip to content

Commit 8ebd49b

Browse files
developernotesdevelopernotes
committed
Using SQLCipher core 3.0.0 from prerelease
1 parent bc7a2dd commit 8ebd49b

15 files changed

+102
-60
lines changed

‎libs/armeabi/libdatabase_sqlcipher.so‎

8.13 KB
Binary file not shown.

‎libs/armeabi/libsqlcipher_android.so‎

-47.9 KB
Binary file not shown.

‎libs/armeabi/libstlport_shared.so‎

-39.9 KB
Binary file not shown.

‎libs/sqlcipher.jar‎

0 Bytes
Binary file not shown.

‎libs/x86/libdatabase_sqlcipher.so‎

274 KB
Binary file not shown.

‎libs/x86/libsqlcipher_android.so‎

193 KB
Binary file not shown.

‎libs/x86/libstlport_shared.so‎

68.7 KB
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,16 @@
108108
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="false" current-in-tab="false">
109109
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
110110
<provider selected="true" editor-type-id="text-editor">
111-
<state line="68" column="45" selection-start="2476" selection-end="2476" vertical-scroll-proportion="0.0">
111+
<state line="68" column="53" selection-start="2495" selection-end="2495" vertical-scroll-proportion="0.0">
112+
<folding />
113+
</state>
114+
</provider>
115+
</entry>
116+
</file>
117+
<file leaf-file-name="MigrateDatabaseFrom1xFormatToCurrentFormat.java" pinned="false" current="false" current-in-tab="false">
118+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrateDatabaseFrom1xFormatToCurrentFormat.java">
119+
<provider selected="true" editor-type-id="text-editor">
120+
<state line="1" column="0" selection-start="27" selection-end="27" vertical-scroll-proportion="0.0">
112121
<folding />
113122
</state>
114123
</provider>
@@ -117,25 +126,27 @@
117126
<file leaf-file-name="MigrationUserVersion.java" pinned="false" current="false" current-in-tab="false">
118127
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationUserVersion.java">
119128
<provider selected="true" editor-type-id="text-editor">
120-
<state line="20" column="5" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0">
129+
<state line="22" column="5" selection-start="748" selection-end="748" vertical-scroll-proportion="0.0">
121130
<folding />
122131
</state>
123132
</provider>
124133
</entry>
125134
</file>
126-
<file leaf-file-name="AverageOpenTimeTest.java" pinned="false" current="true" current-in-tab="true">
135+
<file leaf-file-name="AverageOpenTimeTest.java" pinned="false" current="false" current-in-tab="false">
127136
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java">
128137
<provider selected="true" editor-type-id="text-editor">
129-
<state line="8" column="13" selection-start="172" selection-end="172" vertical-scroll-proportion="0.07700535">
130-
<folding />
138+
<state line="18" column="42" selection-start="441" selection-end="441" vertical-scroll-proportion="0.0">
139+
<folding>
140+
<element signature="imports" expanded="true" />
141+
</folding>
131142
</state>
132143
</provider>
133144
</entry>
134145
</file>
135-
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="false" current-in-tab="false">
146+
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="true" current-in-tab="true">
136147
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
137148
<provider selected="true" editor-type-id="text-editor">
138-
<state line="9" column="13" selection-start="242" selection-end="242" vertical-scroll-proportion="0.0">
149+
<state line="25" column="1" selection-start="699" selection-end="699" vertical-scroll-proportion="0.46203208">
139150
<folding />
140151
</state>
141152
</provider>
@@ -174,7 +185,7 @@
174185
<file leaf-file-name="AttachExistingDatabaseTest.java" pinned="false" current="false" current-in-tab="false">
175186
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
176187
<provider selected="true" editor-type-id="text-editor">
177-
<state line="34" column="22" selection-start="1450" selection-end="1450" vertical-scroll-proportion="0.0">
188+
<state line="35" column="22" selection-start="1521" selection-end="1521" vertical-scroll-proportion="0.0">
178189
<folding />
179190
</state>
180191
</provider>
@@ -199,7 +210,6 @@
199210
<component name="IdeDocumentHistory">
200211
<option name="changedFiles">
201212
<list>
202-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/QueryNonEncryptedDatabaseTest.java" />
203213
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/InvalidPasswordTest.java" />
204214
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/SetLocaleTest.java" />
205215
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java" />
@@ -215,6 +225,7 @@
215225
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/TestResultAdapter.java" />
216226
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java" />
217227
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java" />
228+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrateDatabaseFrom1xFormatToCurrentFormat.java" />
218229
</list>
219230
</option>
220231
</component>
@@ -870,12 +881,13 @@
870881
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57009345" sideWeight="0.66979164" order="13" side_tool="true" content_ui="tabs" />
871882
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26770833" sideWeight="0.49532712" order="2" side_tool="true" content_ui="tabs" />
872883
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
884+
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.02596054" sideWeight="0.46650276" order="10" side_tool="false" content_ui="tabs" />
873885
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6307364" sideWeight="0.91933763" order="8" side_tool="false" content_ui="tabs" />
874886
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32800853" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
875887
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
876888
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.65314835" order="4" side_tool="false" content_ui="tabs" />
877889
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
878-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26770833" sideWeight="0.20145379" order="0" side_tool="false" content_ui="combo" />
890+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26770833" sideWeight="0.97403944" order="0" side_tool="false" content_ui="combo" />
879891
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3276414" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
880892
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3296875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
881893
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -884,7 +896,6 @@
884896
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
885897
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.4909285" order="3" side_tool="false" content_ui="tabs" />
886898
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32917964" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
887-
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.02596054" sideWeight="0.46650276" order="10" side_tool="false" content_ui="tabs" />
888899
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
889900
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
890901
<window_info id="Android Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66560173" sideWeight="0.5184275" order="12" side_tool="false" content_ui="tabs" />
@@ -986,16 +997,9 @@
986997
</state>
987998
</provider>
988999
</entry>
989-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
990-
<provider selected="true" editor-type-id="text-editor">
991-
<state line="50" column="0" selection-start="1911" selection-end="2054" vertical-scroll-proportion="0.0">
992-
<folding />
993-
</state>
994-
</provider>
995-
</entry>
9961000
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationUserVersion.java">
9971001
<provider selected="true" editor-type-id="text-editor">
998-
<state line="20" column="5" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0">
1002+
<state line="22" column="5" selection-start="748" selection-end="748" vertical-scroll-proportion="0.0">
9991003
<folding />
10001004
</state>
10011005
</provider>
@@ -1017,13 +1021,6 @@
10171021
</state>
10181022
</provider>
10191023
</entry>
1020-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
1021-
<provider selected="true" editor-type-id="text-editor">
1022-
<state line="9" column="13" selection-start="242" selection-end="242" vertical-scroll-proportion="0.0">
1023-
<folding />
1024-
</state>
1025-
</provider>
1026-
</entry>
10271024
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestResult.java">
10281025
<provider selected="true" editor-type-id="text-editor">
10291026
<state line="36" column="24" selection-start="700" selection-end="700" vertical-scroll-proportion="0.0">
@@ -1040,7 +1037,7 @@
10401037
</entry>
10411038
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
10421039
<provider selected="true" editor-type-id="text-editor">
1043-
<state line="34" column="22" selection-start="1450" selection-end="1450" vertical-scroll-proportion="0.0">
1040+
<state line="35" column="22" selection-start="1521" selection-end="1521" vertical-scroll-proportion="0.0">
10441041
<folding />
10451042
</state>
10461043
</provider>
@@ -1052,16 +1049,32 @@
10521049
</state>
10531050
</provider>
10541051
</entry>
1052+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java">
1053+
<provider selected="true" editor-type-id="text-editor">
1054+
<state line="18" column="42" selection-start="441" selection-end="441" vertical-scroll-proportion="0.0">
1055+
<folding>
1056+
<element signature="imports" expanded="true" />
1057+
</folding>
1058+
</state>
1059+
</provider>
1060+
</entry>
10551061
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
10561062
<provider selected="true" editor-type-id="text-editor">
1057-
<state line="68" column="45" selection-start="2476" selection-end="2476" vertical-scroll-proportion="0.0">
1063+
<state line="68" column="53" selection-start="2495" selection-end="2495" vertical-scroll-proportion="0.0">
10581064
<folding />
10591065
</state>
10601066
</provider>
10611067
</entry>
1062-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AverageOpenTimeTest.java">
1068+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrateDatabaseFrom1xFormatToCurrentFormat.java">
1069+
<provider selected="true" editor-type-id="text-editor">
1070+
<state line="1" column="0" selection-start="27" selection-end="27" vertical-scroll-proportion="0.0">
1071+
<folding />
1072+
</state>
1073+
</provider>
1074+
</entry>
1075+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
10631076
<provider selected="true" editor-type-id="text-editor">
1064-
<state line="8" column="13" selection-start="172" selection-end="172" vertical-scroll-proportion="0.07700535">
1077+
<state line="25" column="1" selection-start="699" selection-end="699" vertical-scroll-proportion="0.46203208">
10651078
<folding />
10661079
</state>
10671080
</provider>

‎src/main/java/net/zetetic/QueryHelper.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package net.zetetic;
2+
3+
import android.database.Cursor;
4+
import net.sqlcipher.database.SQLiteDatabase;
5+
6+
7+
public class QueryHelper {
8+
9+
public static String singleValueFromQuery(SQLiteDatabase database, String query){
10+
Cursor cursor = database.rawQuery(query, new String[]{});
11+
String value = "";
12+
if(cursor != null){
13+
cursor.moveToFirst();
14+
value = cursor.getString(0);
15+
cursor.close();
16+
}
17+
return value;
18+
}
19+
}

‎src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public boolean execute(SQLiteDatabase database) {
3131
String otherPath = other.getAbsolutePath();
3232
String attach = String.format("attach database ? as other key ?");
3333
database.rawExecSQL("pragma cipher_default_use_hmac = off");
34-
database.rawExecSQL(String.format("pragma key='%s'", ZeteticApplication.DATABASE_PASSWORD));
34+
database.rawExecSQL("pragma cipher_default_kdf_iter = 4000;");
3535
database.execSQL(attach, new Object[]{otherPath, ZeteticApplication.DATABASE_PASSWORD});
3636
Cursor result = database.rawQuery("select * from other.t1", new String[]{});
3737
String a = "";
@@ -43,6 +43,7 @@ public boolean execute(SQLiteDatabase database) {
4343
result.close();
4444
}
4545
database.execSQL("detach database other");
46+
database.rawExecSQL("pragma cipher_default_kdf_iter = 64000;");
4647
return a.length() > 0 && b.length() > 0;
4748
} catch (IOException e) {
4849
return false;

0 commit comments

Comments
 (0)