From 4b7445be8e680996cb5bb016e68a4c064ea8cbb6 Mon Sep 17 00:00:00 2001 From: Nriver <6752679+Nriver@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:01:59 +0800 Subject: [PATCH] fix compatibility for old encrypted data --- dump-db/inc/decrypt.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dump-db/inc/decrypt.ts b/dump-db/inc/decrypt.ts index ecbc820b5..60a846746 100644 --- a/dump-db/inc/decrypt.ts +++ b/dump-db/inc/decrypt.ts @@ -16,7 +16,7 @@ function decryptString(dataKey: any, cipherText: any) { return str; } -function decrypt(key: any, cipherText: any, ivLength = 16) { +function decrypt(key: any, cipherText: any) { if (cipherText === null) { return null; } @@ -27,6 +27,8 @@ function decrypt(key: any, cipherText: any, ivLength = 16) { try { 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 cipherTextBuffer = cipherTextBufferWithIv.slice(ivLength);