mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-22 07:46:16 -04:00
Tidied up Base85 issues
This commit is contained in:
parent
b71e3241be
commit
2f097e5dfc
2 changed files with 11 additions and 7 deletions
|
@ -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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue