Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-10 18:39:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #947 from TriliumNext/bugfix/dump-db-ivlength

Browse Source 
Fix default ivLength in dump-db tool
This commit is contained in:
Elian Doran 2025-01-17 18:39:30 +02:00 committed by GitHub
commit 66c367fe21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dump-db/inc/data_key.ts
View File

@ -12,7 +12,7 @@ function getDataKey(password: any) {
const encryptedDataKey = getOption("encryptedDataKey"); const encryptedDataKey = getOption("encryptedDataKey");
const decryptedDataKey = decryptService.decrypt(passwordDerivedKey, encryptedDataKey, 16); const decryptedDataKey = decryptService.decrypt(passwordDerivedKey, encryptedDataKey);
return decryptedDataKey; return decryptedDataKey;
} catch (e: any) { } catch (e: any) {

4
dump-db/inc/decrypt.ts
View File

@ -16,7 +16,7 @@ function decryptString(dataKey: any, cipherText: any) {
return str; return str;
} }
function decrypt(key: any, cipherText: any, ivLength = 13) { function decrypt(key: any, cipherText: any) {
if (cipherText === null) { if (cipherText === null) {
return null; return null;
} }
@ -27,6 +27,8 @@ function decrypt(key: any, cipherText: any, ivLength = 13) {
try { try {
const cipherTextBufferWithIv = Buffer.from(cipherText.toString(), "base64"); const cipherTextBufferWithIv = Buffer.from(cipherText.toString(), "base64");
// old encrypted data can have IV of length 13, see some details here: https://github.com/zadam/trilium/issues/3017
const ivLength = cipherTextBufferWithIv.length % 16 === 0 ? 16 : 13;
const iv = cipherTextBufferWithIv.slice(0, ivLength); const iv = cipherTextBufferWithIv.slice(0, ivLength);
const cipherTextBuffer = cipherTextBufferWithIv.slice(ivLength); const cipherTextBuffer = cipherTextBufferWithIv.slice(ivLength);