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

manual fixes

Browse source
This commit is contained in:
Thomas Grainger 2017-04-13 18:31:26 +01:00
parent b33f73ac9a
commit d05543db30
No known key found for this signature in database
GPG key ID: 995EA0A029283160
16 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/operations/Code.js
View file

@ -242,7 +242,8 @@ const Code = {
// Indent
let i = 0,
level = 0;
level = 0,
indent;
while (i < code.length) {
switch (code[i]) {
case "{":
@ -252,7 +253,7 @@ const Code = {
if (i+1 >= code.length) break;
if (code[i+1] === "}") level--;
var indent = (level >= 0) ? Array(level*4+1).join(" ") : "";
indent = (level >= 0) ? Array(level*4+1).join(" ") : "";
code = code.substring(0, i+1) + indent + code.substring(i+1);
if (level > 0) i += level*4;

10
src/core/operations/Entropy.js
View file

@ -91,10 +91,11 @@ const Entropy = {
let distrib = new Array(256),
percentages = new Array(256),
len = input.length,
showZeroes = args[0];
showZeroes = args[0],
i;
// Initialise distrib to 0
for (var i = 0; i < 256; i++) {
for (i = 0; i < 256; i++) {
distrib[i] = 0;
}
@ -149,9 +150,10 @@ const Entropy = {
_calcEntropy: function(data) {
let prob = [],
uniques = data.unique(),
str = Utils.byteArrayToChars(data);
str = Utils.byteArrayToChars(data),
i;
for (var i = 0; i < uniques.length; i++) {
for (i = 0; i < uniques.length; i++) {
prob.push(str.count(Utils.chr(uniques[i])) / data.length);
}

7
src/core/operations/HTML.js
View file

@ -160,7 +160,7 @@ const HTML = {
* @returns {html}
*/
runParseColourCode: function(input, args) {
var m = null,
let m = null,
r = 0, g = 0, b = 0, a = 1;
// Read in the input
@ -198,15 +198,16 @@ const HTML = {
b = Math.round(255 * (1 - y_) * (1 - k_));
}
var hsl_ = HTML._rgbToHsl(r, g, b),
let hsl_ = HTML._rgbToHsl(r, g, b),
h = Math.round(hsl_[0] * 360),
s = Math.round(hsl_[1] * 100),
l = Math.round(hsl_[2] * 100),
k = 1 - Math.max(r/255, g/255, b/255),
c = (1 - r/255 - k) / (1 - k),
m = (1 - g/255 - k) / (1 - k), // eslint-disable-line no-redeclare
y = (1 - b/255 - k) / (1 - k);
m = (1 - g/255 - k) / (1 - k);
c = isNaN(c) ? "0" : c.toFixed(2);
m = isNaN(m) ? "0" : m.toFixed(2);
y = isNaN(y) ? "0" : y.toFixed(2);

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

@ -259,6 +259,8 @@ const IP = {
for (let i = 0; i < lines.length; i++) {
if (lines[i] === "") continue;
let baIp = [];
let octets;
let decimal;
if (inFormat === outFormat) {
output += lines[i] + "\n";
@ -268,13 +270,13 @@ const IP = {
// Convert to byte array IP from input format
switch (inFormat) {
case "Dotted Decimal":
var octets = lines[i].split(".");
octets = lines[i].split(".");
for (j = 0; j < octets.length; j++) {
baIp.push(parseInt(octets[j], 10));
}
break;
case "Decimal":
var decimal = lines[i].toString();
decimal = lines[i].toString();
baIp.push(decimal >> 24 & 255);
baIp.push(decimal >> 16 & 255);
baIp.push(decimal >> 8 & 255);
@ -287,21 +289,25 @@ const IP = {
throw "Unsupported input IP format";
}
let ddIp;
let decIp;
let hexIp;
// Convert byte array IP to output format
switch (outFormat) {
case "Dotted Decimal":
var ddIp = "";
ddIp = "";
for (j = 0; j < baIp.length; j++) {
ddIp += baIp[j] + ".";
}
output += ddIp.slice(0, ddIp.length-1) + "\n";
break;
case "Decimal":
var decIp = ((baIp[0] << 24) | (baIp[1] << 16) | (baIp[2] << 8) | baIp[3]) >>> 0;
decIp = ((baIp[0] << 24) | (baIp[1] << 16) | (baIp[2] << 8) | baIp[3]) >>> 0;
output += decIp.toString() + "\n";
break;
case "Hex":
var hexIp = "";
hexIp = "";
for (j = 0; j < baIp.length; j++) {
hexIp += Utils.hex(baIp[j]);
}
@ -352,14 +358,15 @@ const IP = {
output = "",
ip = null,
network = null,
networkStr = "";
networkStr = "",
i;
if (cidr < 0 || cidr > 127) {
return "CIDR must be less than 32 for IPv4 or 128 for IPv6";
}
// Parse all IPs and add to network dictionary
for (var i = 0; i < ips.length; i++) {
for (i = 0; i < ips.length; i++) {
if ((match = IP.IPV4_REGEX.exec(ips[i]))) {
ip = IP._strToIpv4(match[1]) >>> 0;
network = ip & ipv4Mask;
@ -706,10 +713,11 @@ const IP = {
ip2 = IP._strToIpv6(range[14]);
let t = "",
total = new Array(128);
total = new Array(128),
i;
// Initialise total array to "0"
for (var i = 0; i < 128; i++)
for (i = 0; i < 128; i++)
total[i] = "0";
for (i = 0; i < 8; i++) {

3
src/core/operations/PublicKey.js
View file

@ -267,9 +267,10 @@ const PublicKey = {
maxKeyLen = 0,
key,
value,
i,
str;
for (var i = 0; i < fields.length; i++) {
for (i = 0; i < fields.length; i++) {
if (!fields[i].length) continue;
key = fields[i].split("=")[0];

3
src/core/operations/SeqUtils.js
View file

@ -117,11 +117,12 @@ const SeqUtils = {
* @returns {byteArray}
*/
runReverse: function (input, args) {
let i;
if (args[0] === "Line") {
let lines = [],
line = [],
result = [];
for (var i = 0; i < input.length; i++) {
for (i = 0; i < input.length; i++) {
if (input[i] === 0x0a) {
lines.push(line);
line = [];

3
src/core/operations/StrUtils.js
View file

@ -275,10 +275,11 @@ const StrUtils = {
*/
runFilter: function(input, args) {
let delim = Utils.charRep[args[0]],
regex,
reverse = args[2];
try {
var regex = new RegExp(args[1]);
regex = new RegExp(args[1]);
} catch (err) {
return "Invalid regex. Details: " + err.message;
}

8
src/core/operations/Tidy.js
View file

@ -121,9 +121,10 @@ const Tidy = {
// Split input into lines
let lines = [],
line = [];
line = [],
i;
for (var i = 0; i < input.length; i++) {
for (i = 0; i < input.length; i++) {
if (input[i] === 0x0a) {
lines.push(line);
line = [];
@ -174,8 +175,9 @@ const Tidy = {
// Split input into lines
let lines = [],
line = [];
let i;
for (var i = 0; i < input.length; i++) {
for (i = 0; i < input.length; i++) {
if (input[i] === 0x0a) {
lines.push(line);
line = [];

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

@ -91,8 +91,8 @@ const URL_ = {
if (a.search && a.search !== window.location.search) {
output += "Arguments:\n";
const args_ = (a.search.slice(1, a.search.length)).split("&");
let splitArgs = [], padding = 0;
for (var i = 0; i < args_.length; i++) {
let splitArgs = [], padding = 0, i;
for (i = 0; i < args_.length; i++) {
splitArgs.push(args_[i].split("="));
padding = (splitArgs[i][0].length > padding) ? splitArgs[i][0].length : padding;
}