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

Little fixups

Browse source
This commit is contained in:
Barry Brown 2024-06-14 18:13:57 +00:00
parent 3bc95f431d
commit 6a841927a3
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/lib/Ciphers.mjs
View file

@ -4,6 +4,7 @@
* @author Matt C [matt@artemisbot.uk] * @author Matt C [matt@artemisbot.uk]
* @author n1474335 [n1474335@gmail.com] * @author n1474335 [n1474335@gmail.com]
* @author Evie H [evie@evie.sh] * @author Evie H [evie@evie.sh]
* @author Barry B [profbbrown@gmail.com]
* *
* @copyright Crown Copyright 2018 * @copyright Crown Copyright 2018
* @license Apache-2.0 * @license Apache-2.0
@ -80,10 +81,11 @@ export function affineApplication(input, a, b, alphabet, affineFn) {
// If we are matching case, convert entire alphabet to lowercase. // If we are matching case, convert entire alphabet to lowercase.
// This will simplify the encryption. // This will simplify the encryption.
if (matchCase) { if (matchCase)
for (let i = 0; i < alphabet.length; i++) alphabet = alphabet.map((c) => c.toLowerCase());
alphabet[i] = alphabet[i].toLowerCase();
} if (a === undefined || a === "" || isNaN(a)) a = 1;
if (b === undefined || b === "" || isNaN(b)) b = 0;
if (!/^\+?(0|[1-9]\d*)$/.test(a) || !/^\+?(0|[1-9]\d*)$/.test(b)) { if (!/^\+?(0|[1-9]\d*)$/.test(a) || !/^\+?(0|[1-9]\d*)$/.test(b)) {
throw new OperationError("The values of a and b can only be integers."); throw new OperationError("The values of a and b can only be integers.");
@ -133,8 +135,8 @@ const encryptFn = function(p, a, b, m) {
* *
* @author Barry B [profbbrown@gmail.com] * @author Barry B [profbbrown@gmail.com]
* @param {integer} c - Ciphertext value * @param {integer} c - Ciphertext value
* @param {integer} a - Multiplier coefficient * @param {integer} a - Multiplicative inverse coefficient
* @param {integer} b - Addition coefficient * @param {integer} b - Additive inverse coefficient
* @param {integer} m - Modulus * @param {integer} m - Modulus
* @returns {integer} * @returns {integer}
*/ */
@ -178,6 +180,9 @@ export function affineDecrypt(input, a, b, alphabet="a-z") {
if (alphabet === "") if (alphabet === "")
throw new OperationError("The alphabet cannot be empty."); throw new OperationError("The alphabet cannot be empty.");
if (a === undefined || a === "" || isNaN(a)) a = 1;
if (b === undefined || b === "" || isNaN(b)) b = 0;
if (!/^\+?(0|[1-9]\d*)$/.test(a) || !/^\+?(0|[1-9]\d*)$/.test(b)) { if (!/^\+?(0|[1-9]\d*)$/.test(a) || !/^\+?(0|[1-9]\d*)$/.test(b)) {
throw new OperationError("The values of a and b can only be integers."); throw new OperationError("The values of a and b can only be integers.");
} }
@ -248,7 +253,7 @@ export const AFFINE_ALPHABETS = [
{name: "Letters, match case: a-z", value: "a-z"}, {name: "Letters, match case: a-z", value: "a-z"},
{name: "Letters, case sensitive: A-Za-z", value: "A-Za-z"}, {name: "Letters, case sensitive: A-Za-z", value: "A-Za-z"},
{name: "Word characters: A-Za-z0-9_", value: "A-Za-z0-9_"}, {name: "Word characters: A-Za-z0-9_", value: "A-Za-z0-9_"},
{name: "Printable ASCII: space-~", value: "\\u0020-~"} {name: "Printable ASCII: space-~", value: "\\x20-~"}
]; ];
/** /**