Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Utils.fromHex function now defaults to automatically strip all delimiters. Fixes #295

This commit is contained in:
n1474335 2018-04-30 16:51:04 +00:00
parent d18a7df3bc
commit 72f7f0b70c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Utils.js
View File

@ -718,10 +718,10 @@ const Utils = {
* Utils.fromHex("0a:14:1e", "Colon");
*/
fromHex: function(data, delim, byteLen) {
delim = delim || (data.indexOf(" ") >= 0 ? "Space" : "None");
delim = delim || "Auto";
byteLen = byteLen || 2;
if (delim !== "None") {
const delimRegex = Utils.regexRep[delim];
const delimRegex = delim === "Auto" ? /[^a-f\d]/gi : Utils.regexRep[delim];
data = data.replace(delimRegex, "");
}

4
src/core/config/OperationConfig.js
View File

@ -624,7 +624,7 @@ const OperationConfig = {
{
name: "Delimiter",
type: "option",
value: ByteRepr.HEX_DELIM_OPTIONS
value: ByteRepr.FROM_HEX_DELIM_OPTIONS
}
]
},
@ -639,7 +639,7 @@ const OperationConfig = {
{
name: "Delimiter",
type: "option",
value: ByteRepr.HEX_DELIM_OPTIONS
value: ByteRepr.TO_HEX_DELIM_OPTIONS
}
]
},

7
src/core/operations/ByteRepr.js
View File

@ -21,7 +21,12 @@ const ByteRepr = {
* @constant
* @default
*/
HEX_DELIM_OPTIONS: ["Space", "Comma", "Semi-colon", "Colon", "Line feed", "CRLF", "0x", "\\x", "None"],
TO_HEX_DELIM_OPTIONS: ["Space", "Comma", "Semi-colon", "Colon", "Line feed", "CRLF", "0x", "\\x", "None"],
/**
* @constant
* @default
*/
FROM_HEX_DELIM_OPTIONS: ["Auto", "Space", "Comma", "Semi-colon", "Colon", "Line feed", "CRLF", "0x", "\\x", "None"],
/**
* @constant
* @default