mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-22 07:46:16 -04:00
Tidied up Base45 ops
This commit is contained in:
parent
709b8696fc
commit
4f0b160ed3
4 changed files with 23 additions and 12 deletions
|
@ -24,4 +24,4 @@ export function highlightFromBase45(pos, args) {
|
|||
return pos;
|
||||
}
|
||||
|
||||
export const ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
|
||||
export const ALPHABET = "0-9A-Z $%*+\\-./:";
|
||||
|
|
|
@ -27,6 +27,13 @@ class FromBase45 extends Operation {
|
|||
this.infoURL = "https://wikipedia.org/wiki/List_of_numeral_systems";
|
||||
this.inputType = "string";
|
||||
this.outputType = "byteArray";
|
||||
this.args = [
|
||||
{
|
||||
name: "Alphabet",
|
||||
type: "string",
|
||||
value: ALPHABET
|
||||
}
|
||||
];
|
||||
|
||||
this.highlight = highlightFromBase45;
|
||||
this.highlightReverse = highlightToBase45;
|
||||
|
@ -39,6 +46,7 @@ class FromBase45 extends Operation {
|
|||
*/
|
||||
run(input, args) {
|
||||
if (!input) return [];
|
||||
const alphabet = Utils.expandAlphRange(args[0]);
|
||||
|
||||
const res = [];
|
||||
|
||||
|
@ -46,7 +54,7 @@ class FromBase45 extends Operation {
|
|||
triple.reverse();
|
||||
let b = 0;
|
||||
for (const c of triple) {
|
||||
const idx = ALPHABET.indexOf(c);
|
||||
const idx = alphabet.indexOf(c);
|
||||
if (idx === -1) {
|
||||
throw new OperationError(`Character not in alphabet: '${c}'`);
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ class ToBase45 extends Operation {
|
|||
{
|
||||
name: "Alphabet",
|
||||
type: "string",
|
||||
value: "0-9A-Za-z"
|
||||
value: ALPHABET
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -44,6 +44,7 @@ class ToBase45 extends Operation {
|
|||
*/
|
||||
run(input, args) {
|
||||
input = new Uint8Array(input);
|
||||
const alphabet = Utils.expandAlphRange(args[0]);
|
||||
if (!input) return "";
|
||||
|
||||
const res = [];
|
||||
|
@ -57,7 +58,7 @@ class ToBase45 extends Operation {
|
|||
|
||||
let chars = 0;
|
||||
do {
|
||||
res.push(ALPHABET[b % 45]);
|
||||
res.push(alphabet[b % 45]);
|
||||
chars++;
|
||||
b = Math.floor(b / 45);
|
||||
} while (b > 0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue