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

aes.js: bugfixes

Browse Source 
decryption is no longer broken with custom keys
This commit is contained in:
dogeystamp 2023-01-03 21:50:27 -05:00
parent 76fd0c0a1c
commit 18a58786ac
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/aes.js
View File

@ -54,7 +54,21 @@ let decMsg = decForm.createTextArea({
label: "Encrypted message", label: "Encrypted message",
dataType: "json-b64", dataType: "json-b64",
}); });
let decPass = decForm.createPasswordInput({label: "Password"}); let decPass = decForm.createPasswordInput({
label: "Password",
enabledFunc: function() {return !decManualKey.value}
});
let decKey = decForm.createMediumTextBox({
label: "Key",
dataType: "b64",
advanced: true,
enabled: false,
enabledFunc: function() {return decManualKey.value}
});
let decManualKey = decForm.createCheckBox({
label: "Use fixed key instead of password",
advanced: true
});
let decButton = decForm.createButton({label: "Decrypt"}); let decButton = decForm.createButton({label: "Decrypt"});
let decOut = decForm.createOutput({label: "Output"}); let decOut = decForm.createOutput({label: "Output"});
@ -90,7 +104,8 @@ function getKey(keyMaterial, salt) {
encButton.handle.addEventListener("click", async function() { encButton.handle.addEventListener("click", async function() {
let keyMaterial = await getKeyMaterial(encPass.value); let keyMaterial = await getKeyMaterial(encPass.value);
let key; let key;
let salt; let salt = encSalt.value;
if (encManualKey.value) { if (encManualKey.value) {
key = await window.crypto.subtle.importKey( key = await window.crypto.subtle.importKey(
"raw", "raw",
@ -157,7 +172,18 @@ decButton.handle.addEventListener("click", async function() {
} }
let keyMaterial = await getKeyMaterial(decPass.value); let keyMaterial = await getKeyMaterial(decPass.value);
let key = await getKey(keyMaterial, salt); let key;
if (decManualKey.value) {
key = await window.crypto.subtle.importKey(
"raw",
decKey.value,
{"name": "AES-GCM"},
true,
["encrypt", "decrypt"]
);
} else {
key = await getKey(keyMaterial, salt);
}
let plaintext; let plaintext;