mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-12 01:01:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added 'Key Padding' to AES

Browse source
This commit is contained in:
Michael Rowley 2022-03-22 22:31:20 +00:00
parent ed542582f9
commit bdef47dad8
4 changed files with 176 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core/operations/AESDecrypt.mjs
View file

@ -90,6 +90,11 @@ class AESDecrypt extends Operation {
"type": "toggleString",
"value": "",
"toggleValues": ["Hex", "UTF8", "Latin1", "Base64"]
},
{
"name": "Key Padding",
"type": "option",
"value": ["None", "Null", "Repeat"]
}
];
}
@ -102,15 +107,31 @@ class AESDecrypt extends Operation {
* @throws {OperationError} if cannot decrypt input or invalid key length
*/
run(input, args) {
const key = Utils.convertToByteString(args[0].string, args[0].option),
iv = Utils.convertToByteString(args[1].string, args[1].option),
var key = Utils.convertToByteString(args[0].string, args[0].option);
const iv = Utils.convertToByteString(args[1].string, args[1].option),
mode = args[2],
inputType = args[3],
outputType = args[4],
gcmTag = Utils.convertToByteString(args[5].string, args[5].option),
aad = Utils.convertToByteString(args[6].string, args[6].option);
aad = Utils.convertToByteString(args[6].string, args[6].option),
keyPadding = args[7],
keySizes = [16, 24, 32];
if ([16, 24, 32].indexOf(key.length) < 0) {
if (keyPadding !== "None") {
var targetKeySize = 0;
for (var i = 0; i < keySizes.length; i++) {
if (key.length < keySizes[i]) {
targetKeySize = keySizes[i];
break;
}
}
if (targetKeySize !== 0) {
const originalLength = key.length;
key = key.padEnd(targetKeySize, keyPadding == "Null" ? "\0" : key);
}
}
if (keySizes.indexOf(key.length) < 0) {
throw new OperationError(`Invalid key length: ${key.length} bytes
The following algorithms will be used based on the size of the key:

30
src/core/operations/AESEncrypt.mjs
View file

@ -84,6 +84,11 @@ class AESEncrypt extends Operation {
"type": "toggleString",
"value": "",
"toggleValues": ["Hex", "UTF8", "Latin1", "Base64"]
},
{
"name": "Key Padding",
"type": "option",
"value": ["None", "Null", "Repeat"]
}
];
}
@ -96,14 +101,30 @@ class AESEncrypt extends Operation {
* @throws {OperationError} if invalid key length
*/
run(input, args) {
const key = Utils.convertToByteString(args[0].string, args[0].option),
iv = Utils.convertToByteString(args[1].string, args[1].option),
var key = Utils.convertToByteString(args[0].string, args[0].option);
const iv = Utils.convertToByteString(args[1].string, args[1].option),
mode = args[2],
inputType = args[3],
outputType = args[4],
aad = Utils.convertToByteString(args[5].string, args[5].option);
aad = Utils.convertToByteString(args[5].string, args[5].option),
keyPadding = args[6],
keySizes = [16, 24, 32];
if ([16, 24, 32].indexOf(key.length) < 0) {
if (keyPadding !== "None") {
var targetKeySize = 0;
for (var i = 0; i < keySizes.length; i++) {
if (key.length < keySizes[i]) {
targetKeySize = keySizes[i];
break;
}
}
if (targetKeySize !== 0) {
const originalLength = key.length;
key = key.padEnd(targetKeySize, keyPadding == "Null" ? "\0" : key);
}
}
if (keySizes.indexOf(key.length) < 0) {
throw new OperationError(`Invalid key length: ${key.length} bytes
The following algorithms will be used based on the size of the key:
@ -113,7 +134,6 @@ The following algorithms will be used based on the size of the key:
}
input = Utils.convertToByteString(input, inputType);
const cipher = forge.cipher.createCipher("AES-" + mode, key);
cipher.start({
iv: iv,