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

Merge remote-tracking branch 'upstream/master' into multiple-input-files

Browse source
This commit is contained in:
j433866 2019-06-14 14:56:16 +01:00
commit 05d81eb734
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/operations/AESEncrypt.mjs
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];

2
src/web/App.mjs
View file

@ -115,7 +115,7 @@ class App {
handleError(err, logToConsole) {
if (logToConsole) log.error(err);
const msg = err.displayStr || err.toString();
this.alert(msg, this.options.errorTimeout, !this.options.showErrors);
this.alert(Utils.escapeHtml(msg), this.options.errorTimeout, !this.options.showErrors);
}