10.3.0

Missing comma in array

CHANGELOG.md

@@ -13,6 +13,16 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [10.3.0] - 2023-03-24
+- Added 'Argon2' and 'Argon2 compare' operations [@Xenonym] | [#661]
+
+### [10.2.0] - 2023-03-23
+- Added 'Derive HKDF key' operation [@mikecat] | [#1528]
+
+### [10.1.0] - 2023-03-23
+- Added 'Levenshtein Distance' operation [@mikecat] | [#1498]
+- Added 'Swap case' operation [@mikecat] | [#1499]
+
 ## [10.0.0] - 2023-03-22
 - [Full details explained here](https://github.com/gchq/CyberChef/wiki/Character-encoding,-EOL-separators,-and-editor-features)
 - Status bars added to the Input and Output [@n1474335] | [#1405]
@@ -358,6 +368,9 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[10.3.0]: https://github.com/gchq/CyberChef/releases/tag/v10.3.0
+[10.2.0]: https://github.com/gchq/CyberChef/releases/tag/v10.2.0
+[10.1.0]: https://github.com/gchq/CyberChef/releases/tag/v10.1.0
 [10.0.0]: https://github.com/gchq/CyberChef/releases/tag/v10.0.0
 [9.55.0]: https://github.com/gchq/CyberChef/releases/tag/v9.55.0
 [9.54.0]: https://github.com/gchq/CyberChef/releases/tag/v9.54.0
@@ -505,6 +518,7 @@ All major and minor version changes will be documented in this file. Details of
 [@valdelaseras]: https://github.com/valdelaseras
 [@brun0ne]: https://github.com/brun0ne
 [@joostrijneveld]: https://github.com/joostrijneveld
+[@Xenonym]: https://github.com/Xenonym
 
 [8ad18b]: https://github.com/gchq/CyberChef/commit/8ad18bc7db6d9ff184ba3518686293a7685bf7b7
 [9a33498]: https://github.com/gchq/CyberChef/commit/9a33498fed26a8df9c9f35f39a78a174bf50a513
@@ -617,4 +631,8 @@ All major and minor version changes will be documented in this file. Details of
 [#1466]: https://github.com/gchq/CyberChef/pull/1466
 [#1456]: https://github.com/gchq/CyberChef/pull/1456
 [#1450]: https://github.com/gchq/CyberChef/pull/1450
+[#1498]: https://github.com/gchq/CyberChef/pull/1498
+[#1499]: https://github.com/gchq/CyberChef/pull/1499
+[#1528]: https://github.com/gchq/CyberChef/pull/1528
+[#661]: https://github.com/gchq/CyberChef/pull/661
 

package-lock.json

@@ -1,18 +1,19 @@
 {
   "name": "cyberchef",
-  "version": "10.0.1",
+  "version": "10.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cyberchef",
-      "version": "10.0.1",
+      "version": "10.3.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@astronautlabs/amf": "^0.0.6",
         "@babel/polyfill": "^7.12.1",
         "@blu3r4y/lzma": "^2.3.3",
+        "argon2-browser": "^1.18.0",
         "arrive": "^2.4.1",
         "avsc": "^5.7.7",
         "bcryptjs": "^2.4.3",
@@ -109,6 +110,7 @@
         "babel-loader": "^9.1.2",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "babel-plugin-transform-builtin-extend": "1.1.2",
+        "base64-loader": "^1.0.0",
         "chromedriver": "^110.0.0",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
@@ -3200,6 +3202,11 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/argon2-browser": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
+      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "license": "Python-2.0"
@@ -3633,6 +3640,12 @@
       ],
       "license": "MIT"
     },
+    "node_modules/base64-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
+      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
+      "dev": true
+    },
     "node_modules/basic-auth": {
       "version": "2.0.1",
       "dev": true,
@@ -16040,6 +16053,11 @@
       "version": "5.0.1",
       "dev": true
     },
+    "argon2-browser": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",
+      "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw=="
+    },
     "argparse": {
       "version": "2.0.1"
     },
@@ -16347,6 +16365,12 @@
     "base64-js": {
       "version": "1.5.1"
     },
+    "base64-loader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64-loader/-/base64-loader-1.0.0.tgz",
+      "integrity": "sha512-p32+F8dg+ANGx7s8QsZS74ZPHfIycmC2yZcoerzFgbersIYWitPbbF39G6SBx3gyvzyLH5nt1ooocxr0IHuWKA==",
+      "dev": true
+    },
     "basic-auth": {
       "version": "2.0.1",
       "dev": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "10.0.1",
+  "version": "10.3.0",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -54,6 +54,7 @@
     "babel-loader": "^9.1.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-transform-builtin-extend": "1.1.2",
+    "base64-loader": "^1.0.0",
     "chromedriver": "^110.0.0",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
@@ -94,6 +95,7 @@
     "@astronautlabs/amf": "^0.0.6",
     "@babel/polyfill": "^7.12.1",
     "@blu3r4y/lzma": "^2.3.3",
+    "argon2-browser": "^1.18.0",
     "arrive": "^2.4.1",
     "avsc": "^5.7.7",
     "bcryptjs": "^2.4.3",
@@ -178,8 +180,8 @@
     "start": "npx grunt dev",
     "build": "npx grunt prod",
     "node": "npx grunt node",
-    "repl": "node --experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings src/node/repl.mjs",
-    "test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider tests/operations/index.mjs",
+    "repl": "node --experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-experimental-fetch --no-warnings src/node/repl.mjs",
+    "test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch tests/operations/index.mjs",
     "testnodeconsumer": "npx grunt testnodeconsumer",
     "testui": "npx grunt testui",
     "testuidev": "npx nightwatch --env=dev",

src/core/config/Categories.json

@@ -121,6 +121,7 @@
             "Substitute",
             "Derive PBKDF2 key",
             "Derive EVP key",
+            "Derive HKDF key",
             "Bcrypt",
             "Scrypt",
             "JWT Sign",
@@ -247,6 +248,7 @@
             "Remove null bytes",
             "To Upper case",
             "To Lower case",
+            "Swap case",
             "To Case Insensitive Regex",
             "From Case Insensitive Regex",
             "Add line numbers",
@@ -271,6 +273,7 @@
             "Fuzzy Match",
             "Offset checker",
             "Hamming Distance",
+            "Levenshtein Distance",
             "Convert distance",
             "Convert area",
             "Convert mass",
@@ -378,6 +381,8 @@
             "Bcrypt",
             "Bcrypt compare",
             "Bcrypt parse",
+            "Argon2",
+            "Argon2 compare",
             "Scrypt",
             "NT Hash",
             "LM Hash",

src/core/operations/Argon2.mjs

@@ -0,0 +1,117 @@
+/**
+ * @author Tan Zhen Yong [tzy@beyondthesprawl.com]
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import Utils from "../Utils.mjs";
+import argon2 from "argon2-browser";
+
+/**
+ * Argon2 operation
+ */
+class Argon2 extends Operation {
+
+    /**
+     * Argon2 constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Argon2";
+        this.module = "Crypto";
+        this.description = "Argon2 is a key derivation function that was selected as the winner of the Password Hashing Competition in July 2015. It was designed by Alex Biryukov, Daniel Dinu, and Dmitry Khovratovich from the University of Luxembourg.<br><br>Enter the password in the input to generate its hash.";
+        this.infoURL = "https://wikipedia.org/wiki/Argon2";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                "name": "Salt",
+                "type": "toggleString",
+                "value": "somesalt",
+                "toggleValues": ["UTF8", "Hex", "Base64", "Latin1"]
+            },
+            {
+                "name": "Iterations",
+                "type": "number",
+                "value": 3
+            },
+            {
+                "name": "Memory (KiB)",
+                "type": "number",
+                "value": 4096
+            },
+            {
+                "name": "Parallelism",
+                "type": "number",
+                "value": 1
+            },
+            {
+                "name": "Hash length (bytes)",
+                "type": "number",
+                "value": 32
+            },
+            {
+                "name": "Type",
+                "type": "option",
+                "value": ["Argon2i", "Argon2d", "Argon2id"],
+                "defaultIndex": 0
+            },
+            {
+                "name": "Output format",
+                "type": "option",
+                "value": ["Encoded hash", "Hex hash", "Raw hash"]
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    async run(input, args) {
+        const argon2Types = {
+            "Argon2i": argon2.ArgonType.Argon2i,
+            "Argon2d": argon2.ArgonType.Argon2d,
+            "Argon2id": argon2.ArgonType.Argon2id
+        };
+
+        const salt = Utils.convertToByteString(args[0].string || "", args[0].option),
+            time = args[1],
+            mem = args[2],
+            parallelism = args[3],
+            hashLen = args[4],
+            type = argon2Types[args[5]],
+            outFormat = args[6];
+
+        try {
+            const result = await argon2.hash({
+                pass: input,
+                salt,
+                time,
+                mem,
+                parallelism,
+                hashLen,
+                type,
+            });
+
+            switch (outFormat) {
+                case "Hex hash":
+                    return result.hashHex;
+                case "Raw hash":
+                    return Utils.arrayBufferToStr(result.hash);
+                case "Encoded hash":
+                default:
+                    return result.encoded;
+            }
+        } catch (err) {
+            throw new OperationError(`Error: ${err.message}`);
+        }
+    }
+
+}
+
+export default Argon2;

src/core/operations/Argon2Compare.mjs

@@ -0,0 +1,58 @@
+/**
+ * @author Tan Zhen Yong [tzy@beyondthesprawl.com]
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import argon2 from "argon2-browser";
+
+/**
+ * Argon2 compare operation
+ */
+class Argon2Compare extends Operation {
+
+    /**
+     * Argon2Compare constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Argon2 compare";
+        this.module = "Crypto";
+        this.description = "Tests whether the input matches the given Argon2 hash. To test multiple possible passwords, use the 'Fork' operation.";
+        this.infoURL = "https://wikipedia.org/wiki/Argon2";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                "name": "Encoded hash",
+                "type": "string",
+                "value": ""
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    async run(input, args) {
+        const encoded = args[0];
+
+        try {
+            await argon2.verify({
+                pass: input,
+                encoded
+            });
+
+            return `Match: ${input}`;
+        } catch (err) {
+            return "No match";
+        }
+    }
+
+}
+
+export default Argon2Compare;

src/core/operations/DeriveHKDFKey.mjs

@@ -0,0 +1,138 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import Utils from "../Utils.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import CryptoApi from "crypto-api/src/crypto-api.mjs";
+
+/**
+ * Derive HKDF Key operation
+ */
+class DeriveHKDFKey extends Operation {
+
+    /**
+     * DeriveHKDFKey constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Derive HKDF key";
+        this.module = "Crypto";
+        this.description = "A simple Hashed Message Authenticaton Code (HMAC)-based key derivation function (HKDF), defined in RFC5869.";
+        this.infoURL = "https://wikipedia.org/wiki/HKDF";
+        this.inputType = "ArrayBuffer";
+        this.outputType = "string";
+        this.args = [
+            {
+                "name": "Salt",
+                "type": "toggleString",
+                "value": "",
+                "toggleValues": ["Hex", "Decimal", "Base64", "UTF8", "Latin1"]
+            },
+            {
+                "name": "Info",
+                "type": "toggleString",
+                "value": "",
+                "toggleValues": ["Hex", "Decimal", "Base64", "UTF8", "Latin1"]
+            },
+            {
+                "name": "Hashing function",
+                "type": "option",
+                "value": [
+                    "MD2",
+                    "MD4",
+                    "MD5",
+                    "SHA0",
+                    "SHA1",
+                    "SHA224",
+                    "SHA256",
+                    "SHA384",
+                    "SHA512",
+                    "SHA512/224",
+                    "SHA512/256",
+                    "RIPEMD128",
+                    "RIPEMD160",
+                    "RIPEMD256",
+                    "RIPEMD320",
+                    "HAS160",
+                    "Whirlpool",
+                    "Whirlpool-0",
+                    "Whirlpool-T",
+                    "Snefru"
+                ],
+                "defaultIndex": 6
+            },
+            {
+                "name": "Extract mode",
+                "type": "argSelector",
+                "value": [
+                    {
+                        "name": "with salt",
+                        "on": [0]
+                    },
+                    {
+                        "name": "no salt",
+                        "off": [0]
+                    },
+                    {
+                        "name": "skip",
+                        "off": [0]
+                    }
+                ]
+            },
+            {
+                "name": "L (number of output octets)",
+                "type": "number",
+                "value": 16,
+                "min": 0
+            },
+        ];
+    }
+
+    /**
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {ArrayBuffer}
+     */
+    run(input, args) {
+        const argSalt = Utils.convertToByteString(args[0].string || "", args[0].option),
+            info = Utils.convertToByteString(args[1].string || "", args[1].option),
+            hashFunc = args[2].toLowerCase(),
+            extractMode = args[3],
+            L = args[4],
+            IKM = Utils.arrayBufferToStr(input, false),
+            hasher = CryptoApi.getHasher(hashFunc),
+            HashLen = hasher.finalize().length;
+
+        if (L < 0) {
+            throw new OperationError("L must be non-negative");
+        }
+        if (L > 255 * HashLen) {
+            throw new OperationError("L too large (maximum length for " + args[2] + " is " + (255 * HashLen) + ")");
+        }
+
+        const hmacHash = function(key, data) {
+            hasher.reset();
+            const mac = CryptoApi.getHmac(key, hasher);
+            mac.update(data);
+            return mac.finalize();
+        };
+        const salt = extractMode === "with salt" ? argSalt : "\0".repeat(HashLen);
+        const PRK = extractMode === "skip" ? IKM : hmacHash(salt, IKM);
+        let T = "";
+        let result = "";
+        for (let i = 1; i <= 255 && result.length < L; i++) {
+            const TNext = hmacHash(PRK, T + info + String.fromCharCode(i));
+            result += TNext;
+            T = TNext;
+        }
+        return CryptoApi.encoder.toHex(result.substring(0, L));
+    }
+
+}
+
+export default DeriveHKDFKey;

src/core/operations/LevenshteinDistance.mjs

@@ -0,0 +1,98 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+
+/**
+ * Levenshtein Distance operation
+ */
+class LevenshteinDistance extends Operation {
+
+    /**
+     * LevenshteinDistance constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Levenshtein Distance";
+        this.module = "Default";
+        this.description = "Levenshtein Distance (also known as Edit Distance) is a string metric to measure a difference between two strings that counts operations (insertions, deletions, and substitutions) on single character that are required to change one string to another.";
+        this.infoURL = "https://wikipedia.org/wiki/Levenshtein_distance";
+        this.inputType = "string";
+        this.outputType = "number";
+        this.args = [
+            {
+                name: "Sample delimiter",
+                type: "binaryString",
+                value: "\\n"
+            },
+            {
+                name: "Insertion cost",
+                type: "number",
+                value: 1
+            },
+            {
+                name: "Deletion cost",
+                type: "number",
+                value: 1
+            },
+            {
+                name: "Substitution cost",
+                type: "number",
+                value: 1
+            },
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    run(input, args) {
+        const [delim, insCost, delCost, subCost] = args;
+        const samples = input.split(delim);
+        if (samples.length !== 2) {
+            throw new OperationError("Incorrect number of samples. Check your input and/or delimiter.");
+        }
+        if (insCost < 0 || delCost < 0 || subCost < 0) {
+            throw new OperationError("Negative costs are not allowed.");
+        }
+        const src = samples[0], dest = samples[1];
+        let currentCost = new Array(src.length + 1);
+        let nextCost = new Array(src.length + 1);
+        for (let i = 0; i < currentCost.length; i++) {
+            currentCost[i] = delCost * i;
+        }
+        for (let i = 0; i < dest.length; i++) {
+            const destc = dest.charAt(i);
+            nextCost[0] = currentCost[0] + insCost;
+            for (let j = 0; j < src.length; j++) {
+                let candidate;
+                // insertion
+                let optCost = currentCost[j + 1] + insCost;
+                // deletion
+                candidate = nextCost[j] + delCost;
+                if (candidate < optCost) optCost = candidate;
+                // substitution or matched character
+                candidate = currentCost[j];
+                if (src.charAt(j) !== destc) candidate += subCost;
+                if (candidate < optCost) optCost = candidate;
+                // store calculated cost
+                nextCost[j + 1] = optCost;
+            }
+            const tempCost = nextCost;
+            nextCost = currentCost;
+            currentCost = tempCost;
+        }
+
+        return currentCost[currentCost.length - 1];
+    }
+
+}
+
+export default LevenshteinDistance;

src/core/operations/SwapCase.mjs

@@ -0,0 +1,76 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+
+/**
+ * Swap case operation
+ */
+class SwapCase extends Operation {
+
+    /**
+     * SwapCase constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Swap case";
+        this.module = "Default";
+        this.description = "Converts uppercase letters to lowercase ones, and lowercase ones to uppercase ones.";
+        this.infoURL = "";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        let result = "";
+        for (let i = 0; i < input.length; i++) {
+            const c = input.charAt(i);
+            const upper = c.toUpperCase();
+            if (c === upper) {
+                result += c.toLowerCase();
+            } else {
+                result += upper;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Highlight Swap case
+     *
+     * @param {Object[]} pos
+     * @param {number} pos[].start
+     * @param {number} pos[].end
+     * @param {Object[]} args
+     * @returns {Object[]} pos
+     */
+    highlight(pos, args) {
+        return pos;
+    }
+
+    /**
+     * Highlight Swap case in reverse
+     *
+     * @param {Object[]} pos
+     * @param {number} pos[].start
+     * @param {number} pos[].end
+     * @param {Object[]} args
+     * @returns {Object[]} pos
+     */
+    highlightReverse(pos, args) {
+        return pos;
+    }
+
+}
+
+export default SwapCase;

src/core/operations/ToTable.mjs

@@ -214,7 +214,7 @@ class ToTable extends Operation {
             output += outputRow(row, longestCells);
             let rowOutput = verticalBorder;
             row.forEach(function(cell, index) {
-                rowOutput += " " +  headerDivider + " " + verticalBorder;
+                rowOutput += " " +  headerDivider.repeat(longestCells[index]) + " " + verticalBorder;
             });
             output += rowOutput += "\n";
 

src/web/html/index.html

@@ -61,7 +61,8 @@
                 "Symlinking emacs and vim to ed...",
                 "Training branch predictor...",
                 "Timing cache hits...",
-                "Speculatively executing recipes..."
+                "Speculatively executing recipes...",
+                "Adding LLM hallucinations..."
             ];
 
             // Shuffle array using Durstenfeld algorithm

src/web/stylesheets/themes/_dark.css

@@ -108,7 +108,7 @@
     /* Highlighter colours */
     --hl1: #264f78;
     --hl2: #675351;
-    --hl3: #ffb6b6;
+    --hl3: #c40000;
     --hl4: #fcf8e3;
     --hl5: #38811b;
 

tests/operations/index.mjs

@@ -130,6 +130,9 @@ import "./tests/FletcherChecksum.mjs";
 import "./tests/CMAC.mjs";
 import "./tests/AESKeyWrap.mjs";
 import "./tests/Rabbit.mjs";
+import "./tests/LevenshteinDistance.mjs";
+import "./tests/SwapCase.mjs";
+import "./tests/HKDF.mjs";
 
 // Cannot test operations that use the File type yet
 // import "./tests/SplitColourChannels.mjs";

tests/operations/tests/HKDF.mjs

@@ -0,0 +1,180 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+import TestRegister from "../../lib/TestRegister.mjs";
+
+TestRegister.addTests([
+    {
+        "name": "HKDF: RFC5869 Test Case 1",
+        "input": "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+        "expectedOutput": "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": "000102030405060708090a0b0c"},
+                    {"option": "Hex", "string": "f0f1f2f3f4f5f6f7f8f9"},
+                    "SHA256", "with salt", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 2",
+        "input": "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f",
+        "expectedOutput": "b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf"},
+                    {"option": "Hex", "string": "b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"},
+                    "SHA256", "with salt", 82,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 3",
+        "input": "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+        "expectedOutput": "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": ""},
+                    {"option": "Hex", "string": ""},
+                    "SHA256", "with salt", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 4",
+        "input": "0b0b0b0b0b0b0b0b0b0b0b",
+        "expectedOutput": "085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": "000102030405060708090a0b0c"},
+                    {"option": "Hex", "string": "f0f1f2f3f4f5f6f7f8f9"},
+                    "SHA1", "with salt", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 5",
+        "input": "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f",
+        "expectedOutput": "0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf"},
+                    {"option": "Hex", "string": "b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"},
+                    "SHA1", "with salt", 82,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 6",
+        "input": "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+        "expectedOutput": "0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": ""},
+                    {"option": "Hex", "string": ""},
+                    "SHA1", "with salt", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 7",
+        "input": "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
+        "expectedOutput": "2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": ""},
+                    {"option": "Hex", "string": ""},
+                    "SHA1", "no salt", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: RFC5869 Test Case 1 with skip extract",
+        "input": "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5",
+        "expectedOutput": "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": ""},
+                    {"option": "Hex", "string": "f0f1f2f3f4f5f6f7f8f9"},
+                    "SHA256", "skip", 42,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "HKDF: too large L",
+        "input": "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
+        "expectedOutput": "L too large (maximum length for SHA256 is 8160)",
+        "recipeConfig": [
+            {
+                "op": "From Hex",
+                "args": ["None"],
+            },
+            {
+                "op": "Derive HKDF key",
+                "args": [
+                    {"option": "Hex", "string": "000102030405060708090a0b0c"},
+                    {"option": "Hex", "string": "f0f1f2f3f4f5f6f7f8f9"},
+                    "SHA256", "with salt", 8161,
+                ],
+            },
+        ],
+    },
+]);

tests/operations/tests/Hash.mjs

@@ -1109,7 +1109,7 @@ TestRegister.addTests([
                 args: ["D-A"]
             }
         ]
-    }
+    },
     /* { // This takes a LONG time to run (over a minute usually).
         name: "Scrypt: RFC test vector 4",
         input: "pleaseletmein",
@@ -1127,4 +1127,36 @@ TestRegister.addTests([
             }
         ]
     }, */
+    {
+        name: "Argon2",
+        input: "argon2password",
+        expectedOutput: "$argon2i$v=19$m=4096,t=3,p=1$c29tZXNhbHQ$s43my9eBljQADuF/LWCG8vGqwAJzOorKQ0Yog8jFvbw",
+        recipeConfig: [
+            {
+                op: "Argon2",
+                args: [
+                    {"option": "UTF8", "string": "somesalt"},
+                    3,
+                    4096,
+                    1,
+                    32,
+                    "Argon2i",
+                    "Encoded hash"
+                ]
+            }
+        ]
+    },
+    {
+        name: "Argon2 compare",
+        input: "argon2password",
+        expectedOutput: "Match: argon2password",
+        recipeConfig: [
+            {
+                op: "Argon2 compare",
+                args: [
+                    "$argon2i$v=19$m=4096,t=3,p=1$c29tZXNhbHQ$s43my9eBljQADuF/LWCG8vGqwAJzOorKQ0Yog8jFvbw"
+                ]
+            }
+        ]
+    }
 ]);

tests/operations/tests/LevenshteinDistance.mjs

@@ -0,0 +1,165 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+import TestRegister from "../../lib/TestRegister.mjs";
+
+TestRegister.addTests([
+    {
+        "name": "Levenshtein Distance: Wikipedia example 1",
+        "input": "kitten\nsitting",
+        "expectedOutput": "3",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: Wikipedia example 2",
+        "input": "saturday\nsunday",
+        "expectedOutput": "3",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: Wikipedia example 1 with substitution cost 2",
+        "input": "kitten\nsitting",
+        "expectedOutput": "5",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, 2,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: varied costs 1",
+        "input": "kitten\nsitting",
+        "expectedOutput": "230",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 10, 100, 1000,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: varied costs 2",
+        "input": "kitten\nsitting",
+        "expectedOutput": "1020",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1000, 100, 10,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: another delimiter",
+        "input": "kitten sitting",
+        "expectedOutput": "3",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    " ", 1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: too few samples",
+        "input": "kitten",
+        "expectedOutput": "Incorrect number of samples. Check your input and/or delimiter.",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: too many samples",
+        "input": "kitten\nsitting\nkitchen",
+        "expectedOutput": "Incorrect number of samples. Check your input and/or delimiter.",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: negative insertion cost",
+        "input": "kitten\nsitting",
+        "expectedOutput": "Negative costs are not allowed.",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", -1, 1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: negative deletion cost",
+        "input": "kitten\nsitting",
+        "expectedOutput": "Negative costs are not allowed.",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, -1, 1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: negative substitution cost",
+        "input": "kitten\nsitting",
+        "expectedOutput": "Negative costs are not allowed.",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 1, 1, -1,
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Levenshtein Distance: cost zero",
+        "input": "kitten\nsitting",
+        "expectedOutput": "0",
+        "recipeConfig": [
+            {
+                "op": "Levenshtein Distance",
+                "args": [
+                    "\\n", 0, 0, 0,
+                ],
+            },
+        ],
+    },
+]);

tests/operations/tests/SwapCase.mjs

@@ -0,0 +1,33 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+import TestRegister from "../../lib/TestRegister.mjs";
+
+TestRegister.addTests([
+    {
+        "name": "Swap Case: basic example",
+        "input": "Hello, World!",
+        "expectedOutput": "hELLO, wORLD!",
+        "recipeConfig": [
+            {
+                "op": "Swap case",
+                "args": [
+                ],
+            },
+        ],
+    },
+    {
+        "name": "Swap Case: empty input",
+        "input": "",
+        "expectedOutput": "",
+        "recipeConfig": [
+            {
+                "op": "Swap case",
+                "args": [
+                ],
+            },
+        ],
+    },
+]);

webpack.config.js

@@ -114,6 +114,8 @@ module.exports = {
         }
     },
     module: {
+        // argon2-browser loads argon2.wasm by itself, so Webpack should not load it
+        noParse: /argon2\.wasm$/,
         rules: [
             {
                 test: /\.m?js$/,
@@ -133,6 +135,12 @@ module.exports = {
                     additionalCode: "var jQuery = false;"
                 }
             },
+            {
+                // Load argon2.wasm as base64-encoded binary file expected by argon2-browser
+                test: /argon2\.wasm$/,
+                loader: "base64-loader",
+                type: "javascript/auto"
+            },
             {
                 test: /prime.worker.min.js$/,
                 type: "asset/source"