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

add links in ckeditor

Browse Source
This commit is contained in:
azivner
2017-12-09 14:11:35 -05:00
parent 7ca043ebc6
commit d2a5921489
9 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/password_encryption.js
View File

@@ -14,7 +14,7 @@ async function verifyPassword(password) {
async function setDataKey(password, plainTextDataKey) {
const passwordDerivedKey = await my_scrypt.getPasswordDerivedKey(password);
const encryptedDataKeyIv = utils.randomSecureToken(16).slice(0, 16);
const encryptedDataKeyIv = utils.randomString(16);
await options.setOption('encrypted_data_key_iv', encryptedDataKeyIv);