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

Merge branch 'MShwed-feature/hex-support-percent-delimiter'

This commit is contained in:
n1474335 2019-03-27 23:11:08 +00:00
parent 58769eb06e 5ac84491c1
commit a44418c6a1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Utils.mjs
View File

@ -1023,6 +1023,7 @@ class Utils {
static charRep(token) { static charRep(token) {
return { return {
"Space": " ", "Space": " ",
"Percent": "%",
"Comma": ",", "Comma": ",",
"Semi-colon": ";", "Semi-colon": ";",
"Colon": ":", "Colon": ":",
@ -1047,6 +1048,7 @@ class Utils {
static regexRep(token) { static regexRep(token) {
return { return {
"Space": /\s+/g, "Space": /\s+/g,
"Percent": /%/g,
"Comma": /,/g, "Comma": /,/g,
"Semi-colon": /;/g, "Semi-colon": /;/g,
"Colon": /:/g, "Colon": /:/g,

2
src/core/lib/Hex.mjs
View File

@ -100,7 +100,7 @@ export function fromHex(data, delim="Auto", byteLen=2) {
/** /**
* To Hexadecimal delimiters. * To Hexadecimal delimiters.
*/ */
export const TO_HEX_DELIM_OPTIONS = ["Space", "Comma", "Semi-colon", "Colon", "Line feed", "CRLF", "0x", "\\x", "None"]; export const TO_HEX_DELIM_OPTIONS = ["Space", "Percent", "Comma", "Semi-colon", "Colon", "Line feed", "CRLF", "0x", "\\x", "None"];
/** /**