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

aes.js: implemented AES-CTR

Browse Source
This commit is contained in:
dogeystamp 2023-01-28 18:21:46 -05:00
parent fd0a0e06b0
commit 7e6b8a0eba
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
1 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
scripts/aes.js
View File

@ -55,11 +55,25 @@ let encIV = encForm.createMediumTextBox({
label: "IV", label: "IV",
dataType: "b64", dataType: "b64",
advanced: true, advanced: true,
enabledFunc: function() {return encManualIV.value} enabledFunc: function() {return encManualIV.value},
visibleFunc: function() {return ["AES-GCM", "AES-CBC"].includes(encMode.value)}
}); });
let encManualIV = encForm.createCheckBox({ let encManualIV = encForm.createCheckBox({
label: "Use fixed IV instead of random", label: "Use fixed IV instead of random",
advanced: true advanced: true,
visibleFunc: function() {return ["AES-GCM", "AES-CBC"].includes(encMode.value)}
});
let encCounter = encForm.createMediumTextBox({
label: "Counter",
dataType: "b64",
advanced: true,
enabledFunc: function() {return encManualCounter.value},
visibleFunc: function() {return encMode.value === "AES-CTR"}
});
let encManualCounter = encForm.createCheckBox({
label: "Use fixed counter instead of random",
advanced: true,
visibleFunc: function() {return encMode.value === "AES-CTR"}
}); });
let encMode = encForm.createDropDown({ let encMode = encForm.createDropDown({
label: "AES mode", label: "AES mode",
@ -73,6 +87,10 @@ let encMode = encForm.createDropDown({
name: "AES-CBC (Cipher Block Chaining)", name: "AES-CBC (Cipher Block Chaining)",
value: "AES-CBC" value: "AES-CBC"
}, },
{
name: "AES-CTR (Counter)",
value: "AES-CTR"
},
] ]
}); });
let encButton = encForm.createButton({label: "Encrypt"}); let encButton = encForm.createButton({label: "Encrypt"});
@ -159,6 +177,17 @@ async function aesCbcEnc(key, iv, msgEncoded) {
msgEncoded msgEncoded
); );
} }
async function aesCtrEnc(key, counter, msgEncoded) {
return window.crypto.subtle.encrypt(
{
"name": "AES-CTR",
"counter": counter,
"length": 64
},
key,
msgEncoded
);
}
encButton.handle.addEventListener("click", async function() { encButton.handle.addEventListener("click", async function() {
let keyMaterial = await getKeyMaterial(encPass.value); let keyMaterial = await getKeyMaterial(encPass.value);
@ -192,11 +221,23 @@ encButton.handle.addEventListener("click", async function() {
} }
let iv; let iv;
if (encManualIV.value) { if (["AES-GCM", "AES-CBC"].includes(encMode.value)) {
iv = encIV.value; if (encManualIV.value) {
} else { iv = encIV.value;
iv = window.crypto.getRandomValues(new Uint8Array(16)); } else {
encIV.value = iv; iv = window.crypto.getRandomValues(new Uint8Array(16));
encIV.value = iv;
}
}
let counter;
if (encMode.value === "AES-CTR") {
if (encManualCounter.value) {
counter = encCounter.value;
} else {
counter = window.crypto.getRandomValues(new Uint8Array(16));
encCounter.value = counter;
}
} }
let enc = new TextEncoder(); let enc = new TextEncoder();
@ -210,6 +251,9 @@ encButton.handle.addEventListener("click", async function() {
case "AES-CBC": case "AES-CBC":
ciphertext = await aesCbcEnc(key, iv, msgEncoded); ciphertext = await aesCbcEnc(key, iv, msgEncoded);
break; break;
case "AES-CTR":
ciphertext = await aesCtrEnc(key, counter, msgEncoded);
break;
default: default:
let e = Error(`Mode '${encMode.value}' is not implemented.`); let e = Error(`Mode '${encMode.value}' is not implemented.`);
encMode.handleError(e); encMode.handleError(e);
@ -222,6 +266,7 @@ encButton.handle.addEventListener("click", async function() {
"ciphertext": bufToB64(ciphertext), "ciphertext": bufToB64(ciphertext),
"salt": bufToB64(salt), "salt": bufToB64(salt),
"iv": bufToB64(iv), "iv": bufToB64(iv),
"counter": bufToB64(counter),
"encMode": encMode.value, "encMode": encMode.value,
"pbkdf2Iters": pbkdf2Iters, "pbkdf2Iters": pbkdf2Iters,
} }
@ -247,14 +292,26 @@ async function aesCbcDec(key, iv, ciphertext) {
ciphertext ciphertext
); );
} }
async function aesCtrDec(key, counter, ciphertext) {
return window.crypto.subtle.decrypt(
{
"name": "AES-CTR",
"counter": counter,
"length": 64
},
key,
ciphertext
);
}
decButton.handle.addEventListener("click", async function() { decButton.handle.addEventListener("click", async function() {
let msgEncoded = decMsg.value; let msgEncoded = decMsg.value;
let ciphertext, iv, salt, encMode, pbkdf2Iters; let ciphertext, iv, counter, salt, encMode, pbkdf2Iters;
try { try {
ciphertext = new b64ToBuf(msgEncoded.ciphertext); ciphertext = new b64ToBuf(msgEncoded.ciphertext);
iv = new Uint8Array(b64ToBuf(msgEncoded.iv)); iv = new Uint8Array(b64ToBuf(msgEncoded.iv));
counter = new Uint8Array(b64ToBuf(msgEncoded.counter));
salt = new Uint8Array(b64ToBuf(msgEncoded.salt)); salt = new Uint8Array(b64ToBuf(msgEncoded.salt));
encMode = msgEncoded.encMode; encMode = msgEncoded.encMode;
pbkdf2Iters = msgEncoded.pbkdf2Iters; pbkdf2Iters = msgEncoded.pbkdf2Iters;
@ -303,6 +360,9 @@ decButton.handle.addEventListener("click", async function() {
case "AES-CBC": case "AES-CBC":
plaintext = await aesCbcDec(key, iv, ciphertext); plaintext = await aesCbcDec(key, iv, ciphertext);
break; break;
case "AES-CTR":
plaintext = await aesCtrDec(key, counter, ciphertext);
break;
default: default:
throw Error(`Mode '${encMode.value}' is not implemented.`); throw Error(`Mode '${encMode.value}' is not implemented.`);
} }