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

Replaced hexToByteArray with fromHex and byteArrayToHex with toHex. Switched displayFilesAsHTML operation to use template strings and introduced markup formatting method.

Browse source
This commit is contained in:
n1474335 2017-07-07 13:23:58 +00:00
parent 2400de337b
commit c460c2bf6b
5 changed files with 62 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/operations/BitwiseOp.js
View file

@ -142,12 +142,12 @@ const BitwiseOp = {
for (let key = 1, l = Math.pow(256, keyLength); key < l; key++) {
result = BitwiseOp._bitOp(input, Utils.hexToByteArray(key.toString(16)), BitwiseOp._xor, nullPreserving, differential);
result = BitwiseOp._bitOp(input, Utils.fromHex(key.toString(16)), BitwiseOp._xor, nullPreserving, differential);
resultUtf8 = Utils.byteArrayToUtf8(result);
if (crib !== "" && resultUtf8.search(regex) === -1) continue;
if (printKey) output += "Key = " + Utils.hex(key, (2*keyLength)) + ": ";
if (outputHex)
output += Utils.byteArrayToHex(result) + "\n";
output += Utils.toHex(result) + "\n";
else
output += Utils.printable(resultUtf8, false) + "\n";
if (printKey) output += "\n";

4
src/core/operations/IP.js
View file

@ -283,7 +283,7 @@ const IP = {
baIp.push(decimal & 255);
break;
case "Hex":
baIp = Utils.hexToByteArray(lines[i]);
baIp = Utils.fromHex(lines[i]);
break;
default:
throw "Unsupported input IP format";
@ -516,7 +516,7 @@ const IP = {
"<tr><td>Destination IP address</td><td>" + IP._ipv4ToStr(dstIP) + "</td></tr>";
if (ihl > 5) {
output += "<tr><td>Options</td><td>" + Utils.byteArrayToHex(options) + "</td></tr>";
output += "<tr><td>Options</td><td>" + Utils.toHex(options) + "</td></tr>";
}
return output + "</table>";