Merge branch 'master' of https://github.com/gchq/CyberChef into bugfix/json-to-csv

This commit is contained in:
mshwed 2019-06-20 13:59:08 -04:00
commit 313d1a580e
8 changed files with 1036 additions and 613 deletions

View file

@ -65,8 +65,8 @@ class AESEncrypt extends Operation {
* @throws {OperationError} if 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];