Fixed bug with hexadecimal keys

Author: Willena

VERSION

@@ -1,3 +1,3 @@
 version=3.39.1
-artifactVersion=3.39.1
+artifactVersion=3.39.1.1-SNAPSHOT
 sqliteMCVersion=1.4.6

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.willena</groupId>
     <artifactId>sqlite-jdbc</artifactId>
-    <version>3.39.1</version>
+    <version>3.39.1.1-SNAPSHOT</version>
     <name>SQLite JDBC</name>
     <description>SQLite JDBC library with encryption and authentication support</description>
     <url>https://github.com/Willena/sqlite-jdbc-crypt</url>

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

@@ -223,9 +223,9 @@ public Builder withHexKey(byte[] key) {
             ByteBuffer byteBuffer = ByteBuffer.wrap(key);
             StringBuilder hexString = new StringBuilder();
             while (byteBuffer.hasRemaining()) {
-                hexString.append(String.format("%02X ", byteBuffer.get()));
+                hexString.append(String.format("%02X", byteBuffer.get()));
             }
-            return withKey(hexString.toString());
+            return withHexKey(hexString.toString());
         }
 
         public Builder withHexKey(String hexkey) {

src/test/java/org/sqlite/mc/SQLiteMCSqlCipherConfigTest.java

@@ -2,7 +2,12 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.io.File;
+import java.io.IOException;
 import java.math.BigInteger;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
 import org.junit.jupiter.api.Test;
 import org.sqlite.SQLiteConfig;
 
@@ -19,6 +24,9 @@ class SQLiteMCSqlCipherConfigTest {
             "54686973206973206D79207070617373776F72642E2E73616C7479206B65792073616C742E"
                     .toLowerCase();
 
+    private static final String hexKey = "54686973206973206D792070";
+    private static final String hexKey2 = "AAFF54686973206973206D792070";
+
     // https://www.baeldung.com/java-byte-arrays-hex-strings
     private static byte[] toBytes(String hexString) {
         byte[] byteArray = new BigInteger(hexString, 16).toByteArray();
@@ -55,4 +63,44 @@ void withRawSaltedKey() {
                 config.build().toProperties().getProperty(SQLiteConfig.Pragma.KEY.pragmaName),
                 ("x'" + saltedHexKeyValid + "'"));
     }
+
+    @Test
+    void withHexKey() {
+        SQLiteMCSqlCipherConfig config = new SQLiteMCSqlCipherConfig();
+        config.withHexKey(toBytes(hexKey));
+
+        Properties buildedConfig = config.build().toProperties();
+
+        assertEquals(buildedConfig.getProperty(SQLiteConfig.Pragma.KEY.pragmaName), hexKey);
+        assertEquals(
+                buildedConfig.getProperty(SQLiteConfig.Pragma.HEXKEY_MODE.pragmaName),
+                SQLiteConfig.HexKeyMode.SSE.getValue());
+    }
+
+    @Test
+    void hexKeyRekey() throws IOException, SQLException {
+        File tmpFile = File.createTempFile("tmp-sqlite", ".db");
+        tmpFile.deleteOnExit();
+
+        SQLiteMCSqlCipherConfig config = new SQLiteMCSqlCipherConfig();
+        Connection con =
+                config.withHexKey(hexKey)
+                        .build()
+                        .createConnection("jdbc:sqlite:file:" + tmpFile.getAbsolutePath());
+        con.createStatement().execute(String.format("PRAGMA hexrekey='%s'", hexKey2));
+        con.close();
+
+        assertThrows(
+                SQLException.class,
+                () ->
+                        config.withHexKey(hexKey)
+                                .build()
+                                .createConnection("jdbc:sqlite:file:" + tmpFile.getAbsolutePath()));
+
+        assertDoesNotThrow(
+                () ->
+                        config.withHexKey(hexKey2)
+                                .build()
+                                .createConnection("jdbc:sqlite:file:" + tmpFile.getAbsolutePath()));
+    }
 }