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

add AES padding options

Browse source
This commit is contained in:
thezero 2019-05-19 23:55:03 +02:00
parent 7298e2db22
commit fb3e02dcb5
2 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,11 @@ class AESDecrypt extends Operation {
"type": "option",
"value": ["CBC", "CFB", "OFB", "CTR", "GCM", "ECB"]
},
{
"name": "Padding",
"type": "option",
"value": ["PKCS#7", "Null byte", "No padding"]
},
{
"name": "Input",
"type": "option",
@ -73,10 +78,8 @@ class AESDecrypt extends Operation {
run(input, args) {
const key = Utils.convertToByteArray(args[0].string, args[0].option),
iv = Utils.convertToByteArray(args[1].string, args[1].option),
mode = args[2],
inputType = args[3],
outputType = args[4],
gcmTag = Utils.convertToByteString(args[5].string, args[5].option);
gcmTag = Utils.convertToByteString(args[6].string, args[6].option),
[,, mode, padding, inputType, outputType,] = args;
if ([16, 24, 32].indexOf(key.length) < 0) {
throw new OperationError(`Invalid key length: ${key.length} bytes
@ -95,7 +98,28 @@ The following algorithms will be used based on the size of the key:
tag: gcmTag
});
decipher.update(forge.util.createBuffer(input));
const result = decipher.finish();
var result = null;
if (padding === "PKCS#7") {
result = decipher.finish();
} else if (padding === "Null byte") {
result = decipher.finish(function(blockSize, buffer, decrypt) {
if (decrypt) {
var len = buffer.length(), count = 0;
for(var i = len - 1; i >= 8; --i) {
if (buffer.at(i) == "00") {
count += 1;
} else {
break;
}
}
return buffer.truncate(count);
}
});
} else {
result = decipher.finish(function(blockSize, buffer, decrypt) {
return true;
});
};
if (result) {
return outputType === "Hex" ? decipher.output.toHex() : decipher.output.getBytes();

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

@ -44,6 +44,11 @@ class AESEncrypt extends Operation {
"type": "option",
"value": ["CBC", "CFB", "OFB", "CTR", "GCM", "ECB"]
},
{
"name": "Padding",
"type": "option",
"value": ["PKCS#7", "Null byte"]
},
{
"name": "Input",
"type": "option",
@ -67,9 +72,7 @@ class AESEncrypt extends Operation {
run(input, args) {
const key = Utils.convertToByteArray(args[0].string, args[0].option),
iv = Utils.convertToByteArray(args[1].string, args[1].option),
mode = args[2],
inputType = args[3],
outputType = args[4];
[,, mode, padding, inputType, outputType] = args;
if ([16, 24, 32].indexOf(key.length) < 0) {
throw new OperationError(`Invalid key length: ${key.length} bytes
@ -85,7 +88,15 @@ The following algorithms will be used based on the size of the key:
const cipher = forge.cipher.createCipher("AES-" + mode, key);
cipher.start({iv: iv});
cipher.update(forge.util.createBuffer(input));
cipher.finish();
if (padding === "PKCS#7") {
cipher.finish();
} else if (padding === "Null byte") {
cipher.finish(function(blockSize, buffer, decrypt) {
if (!decrypt) {
return buffer.fillWithByte(0, blockSize);
}
});
}
if (outputType === "Hex") {
if (mode === "GCM") {