Skip to content

Commit 0bb75ce

Browse files
committed
Fixed miss-usage of the Native SQLInterface causing tests to fail. (Discovered in Willena#28)
1 parent c4a7bce commit 0bb75ce

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/main/java/org/sqlite/mc/SQLiteMCConfig.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,13 @@ protected void applyCipherParametersByNames(Pragma[] pragmas, Connection conn, S
133133
statement.execute(String.format("PRAGMA %s = %s", pragma.getPragmaName(), property));
134134
else {
135135
if (pragma.equals(Pragma.CIPHER)) {
136-
PreparedStatement preparedStatement = conn.prepareStatement("SELECT sqlite3mc_config(?, ?);");
137-
preparedStatement.setString(1, pragma.name());
138-
preparedStatement.setString(2, cipherProperty);
139-
preparedStatement.execute();
136+
String sql = String.format("SELECT sqlite3mc_config('default:%s', '%s');", pragma.getPragmaName(), cipherProperty);
137+
System.out.println(sql);
138+
conn.createStatement().execute(sql);
140139
} else {
141-
PreparedStatement preparedStatement = conn.prepareStatement("SELECT sqlite3mc_config(?, ?, ?);");
142-
preparedStatement.setString(1, cipherProperty);
143-
preparedStatement.setString(2, pragma.name().toLowerCase());
144-
preparedStatement.setString(3, property);
145-
preparedStatement.execute();
140+
String sql = String.format("SELECT sqlite3mc_config('%s', 'default:%s', %s);", cipherProperty, pragma.getPragmaName(), property);
141+
System.out.println(sql);
142+
conn.createStatement().execute(sql);
146143
}
147144
}
148145
}

src/main/java/org/sqlite/mc/SQLiteMCWxAES256Config.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public static SQLiteMCWxAES256Config getDefault(){
3434
SQLiteMCWxAES256Config config = new SQLiteMCWxAES256Config();
3535
config.setLegacy(0);
3636
config.setLegacyPageSize(0);
37+
config.setKdfIter(4001);
3738
return config;
3839
}
3940

src/test/java/org/sqlite/SQLiteMCSQLInterfaceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void genericDatabaseTest(SQLiteMCConfig config) throws IOException, SQLEx
110110
c = cipherDatabaseOpen(config, path, Key1);
111111
assertTrue(String.format("3. Be sure the database with config %s can be read before rekeying with the key '%s' (replacing %s with %s)", config.getClass().getSimpleName(), Key2, Key1, Key2)
112112
, databaseIsReadable(c));
113-
c.createStatement().execute(String.format("PRAGMA rekey=%s", Key2));
113+
c.createStatement().execute(String.format("PRAGMA rekey='%s'", Key2));
114114
assertTrue("4. Be sure the database is still readable after rekeying"
115115
, databaseIsReadable(c));
116116
c.close();

0 commit comments

Comments
 (0)