jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2026-01-06 02:23:20 +00:00
Code Issues Releases Wiki Activity

Tidied up Base85 issues

Browse Source
This commit is contained in:
n1474335
2022-07-08 15:15:53 +01:00
parent b71e3241be
commit 2f097e5dfc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/operations/FromBase85.mjs
View File

@@ -85,6 +85,10 @@ class FromBase85 extends Operation {
throw new OperationError("Alphabet must be of length 85");
}
// Remove delimiters if present
const matches = input.match(/^<~(.+?)~>$/);
if (matches !== null) input = matches[1];
// Remove non-alphabet characters
if (removeNonAlphChars) {
const re = new RegExp("[^" + alphabet.replace(/[[\]\\\-^$]/g, "\\$&") + "]", "g");
@@ -93,13 +97,6 @@ class FromBase85 extends Operation {
if (input.length === 0) return [];
input = input.replace(/\s+/g, "");
if (encoding === "Standard") {
const matches = input.match(/<~(.+?)~>/);
if (matches !== null) input = matches[1];
}
let i = 0;
let block, blockBytes;
while (i < input.length) {