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

aes.js: add 128 bit key support

Browse Source
This commit is contained in:
dogeystamp 2023-01-29 21:06:24 -05:00
parent 455dbb5294
commit 25be65b32f
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,5 +9,5 @@ Currently, the following algorithms are implemented:
* [AES encryption/decryption](https://dogeystamp.github.io/encryptme/aes.html) * [AES encryption/decryption](https://dogeystamp.github.io/encryptme/aes.html)
This uses PBKDF2 to convert a password to a key, then uses 256-bit AES This uses PBKDF2 to convert a password to a key, then uses AES
to encrypt a given message. to encrypt a given message.

30
scripts/aes.js
View File

@ -40,6 +40,20 @@ let encManualSalt = encForm.createCheckBox({
label: "Use fixed salt instead of random", label: "Use fixed salt instead of random",
advanced: true advanced: true
}); });
let encKeySize = encForm.createDropDown({
label: "AES key size",
advanced: true,
options: [
{
name: "128 bits",
value: 128
},
{
name: "256 bits",
value: "256"
},
]
});
let encKey = encForm.createMediumTextBox({ let encKey = encForm.createMediumTextBox({
label: "Key", label: "Key",
dataType: "b64", dataType: "b64",
@ -139,7 +153,7 @@ function getKeyMaterial(password) {
); );
} }
function getKey(keyMaterial, salt, pbkdf2Iters, encMode) { function getKey(keyMaterial, salt, pbkdf2Iters, encMode, keySize) {
return window.crypto.subtle.deriveKey( return window.crypto.subtle.deriveKey(
{ {
"name": "PBKDF2", "name": "PBKDF2",
@ -150,7 +164,7 @@ function getKey(keyMaterial, salt, pbkdf2Iters, encMode) {
keyMaterial, keyMaterial,
{ {
"name": encMode, "name": encMode,
"length": 256 "length": keySize
}, },
true, true,
["encrypt", "decrypt"] ["encrypt", "decrypt"]
@ -216,7 +230,7 @@ encButton.handle.addEventListener("click", async function() {
encSalt.value = salt; encSalt.value = salt;
} }
key = await getKey(keyMaterial, salt, pbkdf2Iters, encMode.value); key = await getKey(keyMaterial, salt, pbkdf2Iters, encMode.value, Number(encKeySize.value));
encKey.value = await window.crypto.subtle.exportKey("raw", key); encKey.value = await window.crypto.subtle.exportKey("raw", key);
} }
@ -268,6 +282,7 @@ encButton.handle.addEventListener("click", async function() {
"iv": bufToB64(iv), "iv": bufToB64(iv),
"counter": bufToB64(counter), "counter": bufToB64(counter),
"encMode": encMode.value, "encMode": encMode.value,
"encKeySize": encKeySize.value,
"pbkdf2Iters": pbkdf2Iters, "pbkdf2Iters": pbkdf2Iters,
} }
}); });
@ -307,13 +322,17 @@ async function aesCtrDec(key, counter, ciphertext) {
decButton.handle.addEventListener("click", async function() { decButton.handle.addEventListener("click", async function() {
let msgEncoded = decMsg.value; let msgEncoded = decMsg.value;
let ciphertext, iv, counter, salt, encMode, pbkdf2Iters; let ciphertext, iv, counter, salt, encMode, pbkdf2Iters, encKeySize;
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)); counter = new Uint8Array(b64ToBuf(msgEncoded.counter));
salt = new Uint8Array(b64ToBuf(msgEncoded.salt)); salt = new Uint8Array(b64ToBuf(msgEncoded.salt));
encMode = msgEncoded.encMode; encMode = msgEncoded.encMode;
encKeySize = msgEncoded.encKeySize;
if (!["128", "256"].includes(encKeySize)) {
throw Error(`Invalid AES key size: '${encKeySize}'`);
}
pbkdf2Iters = msgEncoded.pbkdf2Iters; pbkdf2Iters = msgEncoded.pbkdf2Iters;
if (pbkdf2Iters < 1 || pbkdf2Iters%1 !== 0) { if (pbkdf2Iters < 1 || pbkdf2Iters%1 !== 0) {
throw Error(`Invalid PBKDF2 iterations setting: ${pbkdf2Iters}`); throw Error(`Invalid PBKDF2 iterations setting: ${pbkdf2Iters}`);
@ -347,7 +366,8 @@ decButton.handle.addEventListener("click", async function() {
decMsg.handleError(e); decMsg.handleError(e);
} }
} else { } else {
key = await getKey(keyMaterial, salt, pbkdf2Iters, encMode); key = await getKey(keyMaterial, salt, pbkdf2Iters, encMode, Number(encKeySize));
decKey.value = await window.crypto.subtle.exportKey("raw", key);
} }
let plaintext; let plaintext;