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

cleaned up "CBC" from methods since we don't have CTR

Browse Source
This commit is contained in:
azivner
2017-11-18 12:53:17 -05:00
parent 6b226a319c
commit dec9cad106
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/password_encryption.js
View File

@@ -11,7 +11,7 @@ async function verifyPassword(password) {
return givenPasswordHash === dbPasswordHash;
}
async function setDataKeyCbc(password, plainText) {
async function setDataKey(password, plainText) {
const passwordDerivedKey = await my_scrypt.getPasswordDerivedKey(password);
const encryptedDataKeyIv = utils.randomSecureToken(16).slice(0, 16);
@@ -20,24 +20,24 @@ async function setDataKeyCbc(password, plainText) {
const buffer = Buffer.from(plainText);
const newEncryptedDataKey = data_encryption.encryptCbc(passwordDerivedKey, encryptedDataKeyIv, buffer);
const newEncryptedDataKey = data_encryption.encrypt(passwordDerivedKey, encryptedDataKeyIv, buffer);
await options.setOption('encrypted_data_key', newEncryptedDataKey);
}
async function getDecryptedDataKeyCbc(password) {
async function getDataKey(password) {
const passwordDerivedKey = await my_scrypt.getPasswordDerivedKey(password);
const encryptedDataKeyIv = await options.getOption('encrypted_data_key_iv');
const encryptedDataKey = await options.getOption('encrypted_data_key');
const decryptedDataKey = data_encryption.decryptCbc(passwordDerivedKey, encryptedDataKeyIv, encryptedDataKey);
const decryptedDataKey = data_encryption.decrypt(passwordDerivedKey, encryptedDataKeyIv, encryptedDataKey);
return decryptedDataKey;
}
module.exports = {
verifyPassword,
getDecryptedDataKeyCbc,
setDataKeyCbc
getDataKey,
setDataKey
};