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

cleaned up old CTR encryption methods

Browse Source
This commit is contained in:
azivner
2017-11-18 12:48:54 -05:00
parent 35d5289cca
commit 6b226a319c
3 changed files with 0 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
services/data_encryption.js
View File

@@ -1,13 +1,7 @@
"use strict";
const utils = require('./utils');
const aesjs = require('./aes');
const crypto = require('crypto');
function getDataAes(dataKey) {
return new aesjs.ModeOfOperation.ctr(dataKey, new aesjs.Counter(5));
}
function arraysIdentical(a, b) {
let i = a.length;
if (i !== b.length) return false;
@@ -17,57 +11,11 @@ function arraysIdentical(a, b) {
return true;
}
function decrypt(dataKey, encryptedBase64) {
if (!dataKey) {
return "[protected]";
}
const aes = getDataAes(dataKey);
const encryptedBytes = utils.fromBase64(encryptedBase64);
const decryptedBytes = aes.decrypt(encryptedBytes);
const digest = decryptedBytes.slice(0, 4);
const payload = decryptedBytes.slice(4);
const hashArray = sha256Array(payload);
const computedDigest = hashArray.slice(0, 4);
if (!arraysIdentical(digest, computedDigest)) {
return false;
}
return aesjs.utils.utf8.fromBytes(payload);
}
function encrypt(dataKey, plainText) {
if (!dataKey) {
throw new Error("No data key!");
}
const aes = getDataAes(dataKey);
const payload = Array.from(aesjs.utils.utf8.toBytes(plainText));
const digest = sha256Array(payload).slice(0, 4);
const digestWithPayload = digest.concat(payload);
const encryptedBytes = aes.encrypt(digestWithPayload);
return utils.toBase64(encryptedBytes);
}
function shaArray(content) {
// we use this as simple checksum and don't rely on its security so SHA-1 is good enough
return crypto.createHash('sha1').update(content).digest();
}
function sha256Array(content) {
return crypto.createHash('sha256').update(content).digest();
}
function pad(data) {
let padded = Array.from(data);
@@ -136,8 +84,6 @@ function noteTextIv(iv) {
}
module.exports = {
decrypt,
encrypt,
encryptCbc,
decryptCbc,
decryptCbcString,