Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

fix compatibility for old encrypted data

Browse Source
This commit is contained in:
Nriver
2025-01-16 14:01:59 +08:00
parent 9d32cd36ee
commit 4b7445be8e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 = 16) { 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 = 16) {
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);