Merge branch 'master' of github.com:gchq/CyberChef

This commit is contained in:
n1474335 2019-08-22 16:34:00 +01:00
commit db3faf16b0
2 changed files with 44 additions and 8 deletions

View file

@ -71,8 +71,8 @@ class AESDecrypt extends Operation {
* @throws {OperationError} if cannot decrypt input or invalid key length
*/
run(input, args) {
const key = Utils.convertToByteArray(args[0].string, args[0].option),
iv = Utils.convertToByteArray(args[1].string, args[1].option),
const key = Utils.convertToByteString(args[0].string, args[0].option),
iv = Utils.convertToByteString(args[1].string, args[1].option),
mode = args[2],
inputType = args[3],
outputType = args[4],