cleaner salt

ephemeraHQ · Sep 13, 2024 · 63db076 · 63db076
1 parent bb3ff79
commit 63db076
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/data/db/driver.ts b/data/db/driver.ts
@@ -90,12 +90,11 @@ export const typeORMDriver = (
       const initialDbPath = options.location
         ? path.join(options.location, options.name)
         : options.name;
-      // First check if we can open it without an encryption key
       let db = open(options);
       db.execute(`PRAGMA cipher_plaintext_header_size = 32;`);
       db.execute(`PRAGMA cipher_salt = "x'${encryptionSalt}'";`);
       try {
-        // Try to execute a query with an encryption key
+        // Try to execute a query with the encryption key
         db.execute("SELECT name FROM sqlite_master WHERE type='table';");
       } catch (e: any) {
         logger.warn(

diff --git a/utils/keychain/helpers.ts b/utils/keychain/helpers.ts
@@ -146,7 +146,7 @@ export const getDbEncryptionKey = async () => {
 export const getDbEncryptionSalt = async () => {
   const existingSalt = await getSecureItemAsync("CONVERSE_DB_ENCRYPTION_SALT");
   if (existingSalt) {
-    return existingSalt.slice(0, 32);
+    return existingSalt;
   }
   const newKey = Buffer.from(await getRandomBytesAsync(16));
   const newKeyHex = newKey.toString("hex");