dogeystamp/encryptme
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

aes.js: fix salt changing even when not used

Browse Source
This commit is contained in:
dogeystamp 2023-01-03 21:09:00 -05:00
parent f49f072fab
commit 76fd0c0a1c
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/aes.js
View File

@ -88,17 +88,9 @@ function getKey(keyMaterial, salt) {
} }
encButton.handle.addEventListener("click", async function() { encButton.handle.addEventListener("click", async function() {
let salt;
if (encSalt.enabledFunc()) {
salt = encSalt.value;
} else {
salt = window.crypto.getRandomValues(new Uint8Array(16));
encSalt.value = salt;
}
let keyMaterial = await getKeyMaterial(encPass.value); let keyMaterial = await getKeyMaterial(encPass.value);
let key; let key;
let salt;
if (encManualKey.value) { if (encManualKey.value) {
key = await window.crypto.subtle.importKey( key = await window.crypto.subtle.importKey(
"raw", "raw",
@ -108,6 +100,13 @@ encButton.handle.addEventListener("click", async function() {
["encrypt", "decrypt"] ["encrypt", "decrypt"]
); );
} else { } else {
if (encSalt.enabledFunc()) {
salt = encSalt.value;
} else {
salt = window.crypto.getRandomValues(new Uint8Array(16));
encSalt.value = salt;
}
key = await getKey(keyMaterial, salt); key = await getKey(keyMaterial, salt);
encKey.value = await window.crypto.subtle.exportKey("raw", key); encKey.value = await window.crypto.subtle.exportKey("raw", key);
} }