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

Added Output Encoding Option

Browse source
This commit is contained in:
h345983745 2019-03-26 21:12:03 +00:00
parent 908043fb7f
commit b116b8ba1e
4 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/core/operations/BLAKE2b.mjs
View file

@ -6,6 +6,9 @@
import Operation from "../Operation";
import blakejs from "blakejs";
import OperationError from "../errors/OperationError";
import Utils from "../Utils";
import { toBase64 } from "../lib/Base64";
/**
* BLAKE2b operation
@ -29,6 +32,10 @@ class BLAKE2b extends Operation {
"name": "Size",
"type": "option",
"value": ["512", "384", "256", "160", "128"]
}, {
"name": "Output Encoding",
"type": "option",
"value": ["Hex", "Base64", "Raw"]
}
];
}
@ -36,11 +43,21 @@ class BLAKE2b extends Operation {
/**
* @param {string} input
* @param {Object[]} args
* @returns {string} The input having been hashed with BLAKE2b, HEX encoded.
* @returns {string} The input having been hashed with BLAKE2b in the encoding format speicifed.
*/
run(input, args) {
const [outSize] = args;
return blakejs.blake2bHex(input, null, outSize / 8);
const [outSize, outFormat] = args;
switch (outFormat) {
case "Hex":
return blakejs.blake2bHex(input, null, outSize / 8);
case "Base64":
return toBase64(blakejs.blake2b(input, null, outSize / 8));
case "Raw":
return Utils.arrayBufferToStr(blakejs.blake2b(input, null, outSize / 8).buffer);
default:
return new OperationError("Unsupported Output Type");
}
}
}

23
src/core/operations/BLAKE2s.mjs
View file

@ -6,7 +6,9 @@
import Operation from "../Operation";
import blakejs from "blakejs";
import OperationError from "../errors/OperationError";
import Utils from "../Utils";
import { toBase64 } from "../lib/Base64";
/**
* BLAKE2s Operation
*/
@ -29,6 +31,10 @@ class BLAKE2s extends Operation {
"name": "Size",
"type": "option",
"value": ["256", "160", "128"]
}, {
"name": "Output Encoding",
"type": "option",
"value": ["Hex", "Base64", "Raw"]
}
];
}
@ -36,11 +42,20 @@ class BLAKE2s extends Operation {
/**
* @param {string} input
* @param {Object[]} args
* @returns {string} The input having been hashed with BLAKE2s, HEX encoded.
* @returns {string} The input having been hashed with BLAKE2s in the encoding format speicifed.
*/
run(input, args) {
const [outSize] = args;
return blakejs.blake2sHex(input, null, outSize / 8);
const [outSize, outFormat] = args;
switch (outFormat) {
case "Hex":
return blakejs.blake2sHex(input, null, outSize / 8);
case "Base64":
return toBase64(blakejs.blake2s(input, null, outSize / 8));
case "Raw":
return Utils.arrayBufferToStr(blakejs.blake2s(input, null, outSize / 8).buffer);
default:
return new OperationError("Unsupported Output Type");
}
}
}