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

consistency with ../Base64.mjs

Browse source 
removeNonAlphChars and strictMode params
This commit is contained in:
wjaaaaaaat 2025-02-17 14:52:18 -05:00 • committed by GitHub
parent 7acd9a3bd2
commit d9fb3e28dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/lib/Hex.mjs
View file

@ -100,10 +100,13 @@ export function toHexFast(data) {
* // returns [10,20,30]
* fromHex("0a:14:1e", "Colon");
*/
export function fromHex(data, delim="Auto", byteLen=2, strict=False) {
export function fromHex(data, delim="Auto", byteLen=2, removeNonAlphChars=false, strictMode=false) {
if (byteLen < 1 || Math.round(byteLen) !== byteLen)
throw new OperationError("Byte length must be a positive integer");
if (removeNonAlphChars)
data = data.replace(/[^\da-fA-F]/g, '');
if (delim !== "None") {
const delimRegex = delim === "Auto" ? /\s+|0x/gi : Utils.regexRep(delim);
data = data.split(delimRegex);
@ -113,7 +116,7 @@ export function fromHex(data, delim="Auto", byteLen=2, strict=False) {
const output = [];
for (let i = 0; i < data.length; i++) {
if (/[^a-f\d\s]/.test(data[i]) && strict)
if (/[^a-f\d\s]/.test(data[i]) && strictMode)
throw new OperationError("Hex input must only contain hex digits");
for (let j = 0; j < data[i].length; j += byteLen) {
output.push(parseInt(data[i].substr(j, byteLen), 16));