mirrors/CyberChef
1
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2026-01-30 20:30:32 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Crockford equivalences are added in decoding and tests

Browse source
This commit is contained in:
r4mos 2025-09-09 10:40:26 +02:00
parent b1105b0e21
commit d7915b1a15
2 changed files with 85 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/operations/FromBase32.mjs
View file

@ -73,7 +73,13 @@ class FromBase32 extends Operation {
if (alphabet.length !== 33) {
throw new OperationError("Alphabet must be of length 33"); // 32 characters + 1 padding
}
const isCrockford = alphabet === Utils.expandAlphRange(ALPHABET_OPTIONS.find(opt => opt.name === "Crockford's alphabet").value).join("");
if (isCrockford) {
input = input
.replace(/[oO]/g, "0")
.replace(/[iIlL]/g, "1")
.toUpperCase();
}
let chr1, chr2, chr3, chr4, chr5,
enc1, enc2, enc3, enc4, enc5, enc6, enc7, enc8,
i = 0;

79
tests/operations/tests/Base32.mjs
View file

@ -44,7 +44,7 @@ const ALL_BYTES_EXTENDED_OUT = "000G40O40K30E209185GO38E1S8124GJ2GAHC5OO34D1M70T
const ALL_BYTES_STANDARD_OUT = "AAAQEAYEAUDAOCAJBIFQYDIOB4IBCEQTCQKRMFYYDENBWHA5DYPSAIJCEMSCKJRHFAUSUKZMFUXC6MBRGIZTINJWG44DSOR3HQ6T4P2AIFBEGRCFIZDUQSKKJNGE2TSPKBIVEU2UKVLFOWCZLJNVYXK6L5QGCYTDMRSWMZ3INFVGW3DNNZXXA4LSON2HK5TXPB4XU634PV7H7AEBQKBYJBMGQ6EITCULRSGY5D4QSGJJHFEVS2LZRGM2TOOJ3HU7UCQ2FI5EUWTKPKFJVKV2ZLNOV6YLDMVTWS23NN5YXG5LXPF5X274BQOCYPCMLRWHZDE4VS6MZXHM7UGR2LJ5JVOW27MNTWW33TO55X7A4HROHZHF43T6R2PK5PWO33XP6DY7F47U6X3PP6HZ7L57Z7P674======";
const ALL_BYTES_CROCKFORD_OUT = "000G40R40M30E209185GR38E1W8124GK2GAHC5RR34D1P70X3RFJ08924CJ2A9H750MJMASC5MQ2YC1H68SK8D9P6WW3JEHV7GYKWFT085146H258S3MGJAA9D64TKJFA18N4MTMANB5EP2SB9DNRQAYBXG62RK3CHJPCSV8D5N6PV3DDSQQ0WBJEDT7AXKQF1WQMYVWFNZ7Z041GA1R91C6GY48K2MBHJ6RX3WGJ699754NJTBSH6CTKEE9V7MZM2GT58X4MPKAFA59NANTSBDENYRB3CNKPJTVDDXRQ6XBQF5XQTZW1GE2RF2CBHP7S34WNJYCSQ7CZM6HTB9X9NEPTZCDKPPVVKEXXQZ0W7HE7S75WVKYHTFAXFPEVVQFY3RZ5WZMYQVFFY7SZBXZSZFYZW======";
const WRONG_ALPHABET = "Alphabet must be of length 33"
const WRONG_ALPHABET = "Alphabet must be of length 33";
TestRegister.addTests([
{
@ -311,5 +311,82 @@ TestRegister.addTests([
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("0", "o"),
input: CROCKFORD_OUT.replaceAll("0", "o"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("0", "O"),
input: CROCKFORD_OUT.replaceAll("0", "O"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("1", "I"),
input: CROCKFORD_OUT.replaceAll("1", "I"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("1", "i"),
input: CROCKFORD_OUT.replaceAll("1", "i"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("1", "L"),
input: CROCKFORD_OUT.replaceAll("1", "L"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.replaceAll("1", "l"),
input: CROCKFORD_OUT.replaceAll("1", "l"),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
{
name: "From Base32 Crockford: " + CROCKFORD_OUT.toLowerCase(),
input: CROCKFORD_OUT.toLowerCase(),
expectedOutput: CROCKFORD_INP,
recipeConfig: [
{
op: "From Base32",
args: [ALPHABET_OPTIONS[2].value, false],
},
],
},
]);