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

aes.js: improved error handling

Browse Source
This commit is contained in:
dogeystamp 2023-01-02 15:01:19 -05:00
parent 1f141ccbad
commit 1d9f304830
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/aes.js
View File

@ -77,9 +77,18 @@ async function encrypt() {
async function decrypt() { async function decrypt() {
let msgEncoded = decMsg.value; let msgEncoded = decMsg.value;
let ciphertext = new b64ToBuf(msgEncoded.ciphertext); let ciphertext, iv, salt;
let iv = new Uint8Array(b64ToBuf(msgEncoded.iv)); try {
let salt = new Uint8Array(b64ToBuf(msgEncoded.salt)); ciphertext = new b64ToBuf(msgEncoded.ciphertext);
iv = new Uint8Array(b64ToBuf(msgEncoded.iv));
salt = new Uint8Array(b64ToBuf(msgEncoded.salt));
} catch (e) {
decMsg.alertBox("alert-error", "Invalid base64 value.");
}
if (ciphertext === undefined || iv === undefined || salt === undefined) {
return;
}
let keyMaterial = await getKeyMaterial(decPass.value); let keyMaterial = await getKeyMaterial(decPass.value);
let key = await getKey(keyMaterial, salt); let key = await getKey(keyMaterial, salt);