9.7.20

Merge branch 'gsilvapt-master'
diff.mjs: Fixes tests and adds default flag
2025-12-05 23:53:27 +00:00 · 2019-10-31 13:00:22 +00:00 · 2019-10-31 13:00:15 +00:00 · 2019-10-29 23:39:14 +00:00 · 2019-10-29 23:12:24 +00:00 · 2019-10-28 17:26:13 +00:00
77 changed files with 858 additions and 649 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1 @@
-src/core/vendor/**
-src/web/static/clippy_assets/**
+src/core/vendor/**
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -26,8 +26,8 @@ If applicable, add screenshots to help explain your problem.

 **Desktop (if relevant, please complete the following information):**
 - OS: [e.g. Windows] 
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+ - Browser: [e.g. chrome 72, firefox 60]
+ - CyberChef version: [e.g. 9.7.14]

 **Additional context**
 Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,34 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: 'Bug report: <Insert title here>'
-labels: bug
-assignees: ''
-
---
-
-<!-- Prefix the title above with 'Bug report:' -->
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior or a link to the recipe / input used to cause the bug:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (if relevant, please complete the following information):**
- - OS: [e.g. Windows] 
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ travis.log
 build
 .vscode
 .*.swp
-.DS_Store
 src/core/config/modules/*
 src/core/config/OperationConfig.json
 src/core/operations/index.mjs
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - lts/*
+  - lts/dubnium
 cache: npm
 addons:
  chrome: stable
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,6 @@ const path = require("path");
 * @license Apache-2.0
 */

-
 module.exports = function (grunt) {
    grunt.file.defaultEncoding = "utf8";
    grunt.file.preserveBOM = false;
@@ -102,6 +101,26 @@ module.exports = function (grunt) {
        return entryModules;
    }

+    /**
+     * Detects the correct delimiter to use to chain shell commands together
+     * based on the current OS.
+     *
+     * @param {string[]} cmds
+     * @returns {string}
+     */
+    function chainCommands(cmds) {
+        const win = process.platform === "win32";
+        if (!win) {
+            return cmds.join(";");
+        }
+        return cmds
+            // && means that subsequent commands will not be executed if the
+            // previous one fails. & would coninue on a fail
+            .join("&&")
+            // Windows does not support \n properly
+            .replace("\n", "\\n");
+    }
+
    grunt.initConfig({
        clean: {
            dev: ["build/dev/*"],
@@ -316,10 +335,10 @@ module.exports = function (grunt) {
        },
        exec: {
            repoSize: {
-                command: [
+                command: chainCommands([
                    "git ls-files | wc -l | xargs printf '\n%b\ttracked files\n'",
                    "du -hs | egrep -o '^[^\t]*' | xargs printf '%b\trepository size\n'"
-                ].join(";"),
+                ]),
                stderr: false
            },
            cleanGit: {
@@ -329,20 +348,20 @@ module.exports = function (grunt) {
                command: "node --experimental-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml"
            },
            generateConfig: {
-                command: [
+                command: chainCommands([
                    "echo '\n--- Regenerating config files. ---'",
                    "echo [] > src/core/config/OperationConfig.json",
                    "node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs",
                    "node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs",
                    "echo '--- Config scripts finished. ---\n'"
-                ].join(";")
+                ])
            },
            generateNodeIndex: {
-                command: [
+                command: chainCommands([
                    "echo '\n--- Regenerating node index ---'",
                    "node --experimental-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs",
                    "echo '--- Node index generated. ---\n'"
-                ].join(";"),
+                ]),
            },
            opTests: {
                command: "node --experimental-modules --no-warnings --no-deprecation tests/operations/index.mjs"
@@ -354,40 +373,40 @@ module.exports = function (grunt) {
                command: "node --experimental-modules --no-warnings --no-deprecation tests/node/index.mjs"
            },
            setupNodeConsumers: {
-                command: [
-                    "echo '\n--- Testing node conumers ---'",
+                command: chainCommands([
+                    "echo '\n--- Testing node consumers ---'",
                    "npm link",
                    `mkdir ${nodeConsumerTestPath}`,
                    `cp tests/node/consumers/* ${nodeConsumerTestPath}`,
                    `cd ${nodeConsumerTestPath}`,
                    "npm link cyberchef"
-                ].join(";"),
+                ]),
            },
            teardownNodeConsumers: {
-                command: [
+                command: chainCommands([
                    `rm -rf ${nodeConsumerTestPath}`,
                    "echo '\n--- Node consumer tests complete ---'"
-                ].join(";"),
+                ]),
            },
            testCJSNodeConsumer: {
-                command: [
+                command: chainCommands([
                    `cd ${nodeConsumerTestPath}`,
                    "node --no-warnings cjs-consumer.js",
-                ].join(";"),
+                ]),
                stdout: false,
            },
            testESMNodeConsumer: {
-                command: [
+                command: chainCommands([
                    `cd ${nodeConsumerTestPath}`,
                    "node --no-warnings --experimental-modules esm-consumer.mjs",
-                ].join(";"),
+                ]),
                stdout: false,
            },
            testESMDeepImportNodeConsumer: {
-                command: [
+                command: chainCommands([
                    `cd ${nodeConsumerTestPath}`,
                    "node --no-warnings --experimental-modules esm-deep-import-consumer.mjs",
-                ].join(";"),
+                ]),
                stdout: false,
            },
        },
--- a/README.md
+++ b/README.md
@@ -69,7 +69,15 @@ You can use as many operations as you like in simple or complex ways. Some examp
     - You can save the output to a file at any time or load a file by dragging and dropping it into the input field. Files up to around 2GB are supported (depending on your browser), however some operations may take a very long time to run over this much data.
 - CyberChef is entirely client-side
     - It should be noted that none of your recipe configuration or input (either text or files) is ever sent to the CyberChef web server - all processing is carried out within your browser, on your own computer.
-     - Due to this feature, CyberChef can be compiled into a single HTML file. You can download this file and drop it into a virtual machine, share it with other people, or use it independently on your local machine.
+     - Due to this feature, CyberChef can be downloaded and run locally. You can use the link in the top left corner of the app to download a full copy of CyberChef and drop it into a virtual machine, share it with other people, or host it in a closed network.
+
+
+## Deep linking
+
+By manipulation of CyberChef's URL hash, you can change the initial settings with which the page opens.
+The format is `https://gchq.github.io/CyberChef/#recipe=Operation()&input=...`
+
+Supported arguments are `recipe`, `input` (encoded in Base64), and `theme`. 


 ## Browser support
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "cyberchef",
-  "version": "9.7.6",
+  "version": "9.7.20",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -3107,9 +3107,9 @@
      }
    },
    "chromedriver": {
-      "version": "76.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-76.0.1.tgz",
-      "integrity": "sha512-+8BCemJLKPF2w/UpzA1uNgLWQrg1IgIO4ZYcsAjYYgqD8zUcvQ+RfwA/0TR1Zwv9Mkd8fdzTe21eZ2FyZ83DAg==",
+      "version": "77.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-77.0.0.tgz",
+      "integrity": "sha512-mZa1IVx4HD8rDaItWbnS470mmypgiWsDiu98r0NkiT4uLm3qrANl4vOU6no6vtWtLQiW5kt1POcIbjeNpsLbXA==",
      "dev": true,
      "requires": {
        "del": "^4.1.1",
@@ -3190,14 +3190,6 @@
      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
      "dev": true
    },
-    "clippyjs": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/clippyjs/-/clippyjs-0.0.3.tgz",
-      "integrity": "sha512-i4sPaKbCA6PfXiwxNK35E1io6AXN7VGwEGZR9sE8RqOgXPNtRWKbFubmx87JwSuwIrdClO/rkTMjhl2ZyOHjug==",
-      "requires": {
-        "jquery": "^3.2.1"
-      }
-    },
    "cliui": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -7584,9 +7576,9 @@
      "dev": true
    },
    "https-proxy-agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-      "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
      "dev": true,
      "requires": {
        "agent-base": "^4.3.0",
@@ -8594,9 +8586,9 @@
      "integrity": "sha512-RqscTx95+RTKhFAyjedsboR0Lmo3zd8//EuRwQXkdWmsCwYlzarVRaiYg6kS1O8m10MCQkGdrnlK9L4eAmZUwA=="
    },
    "libyara-wasm": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/libyara-wasm/-/libyara-wasm-0.0.12.tgz",
-      "integrity": "sha512-AjTe4FiBuH4F7HwGT/3UxoRenczXtrbM6oWGrifxb44LrkDh5VxRNg9zwfPpDA5Fcc1iYcXS0WVA/b3DGtD8cQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/libyara-wasm/-/libyara-wasm-1.0.1.tgz",
+      "integrity": "sha512-Vq0EcQ3HRJinFxxb00JZpjyX8NCerazVhSf3+TVt1c21T3pcEJJ3RkanAwT71lW6CCmmmKuNU4QwqsinmR6pKQ=="
    },
    "linkify-it": {
      "version": "2.2.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cyberchef",
-  "version": "9.7.6",
+  "version": "9.7.20",
  "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
  "author": "n1474335 <n1474335@gmail.com>",
  "homepage": "https://gchq.github.io/CyberChef",
@@ -43,7 +43,7 @@
    "babel-eslint": "^10.0.3",
    "babel-loader": "^8.0.6",
    "babel-plugin-dynamic-import-node": "^2.3.0",
-    "chromedriver": "^76.0.1",
+    "chromedriver": "^77.0.0",
    "colors": "^1.3.3",
    "copy-webpack-plugin": "^5.0.4",
    "css-loader": "^3.2.0",
@@ -95,7 +95,6 @@
    "bootstrap-material-design": "^4.1.2",
    "bson": "^4.0.2",
    "chi-squared": "^1.1.0",
-    "clippyjs": "0.0.3",
    "core-js": "^3.2.1",
    "crypto-api": "^0.8.5",
    "crypto-js": "^3.1.9-1",
@@ -123,7 +122,7 @@
    "jsrsasign": "8.0.12",
    "kbpgp": "2.1.3",
    "libbzip2-wasm": "0.0.4",
-    "libyara-wasm": "0.0.12",
+    "libyara-wasm": "^1.0.1",
    "lodash": "^4.17.15",
    "loglevel": "^1.6.3",
    "loglevel-message-prefix": "^3.0.0",
--- a/src/core/Dish.mjs
+++ b/src/core/Dish.mjs
@@ -129,7 +129,7 @@ class Dish {
     *
     * @param {number} type - The data type of value, see Dish enums.
     * @param {boolean} [notUTF8=false] - Do not treat strings as UTF8.
-     * @returns {* | Promise} - (Broswer) A promise | (Node) value of dish in given type
+     * @returns {* | Promise} - (Browser) A promise | (Node) value of dish in given type
     */
    get(type, notUTF8=false) {
        if (typeof type === "string") {
@@ -191,7 +191,7 @@ class Dish {
     *
     * @param {number} type - The data type of value, see Dish enums.
     * @param {boolean} [notUTF8=false] - Do not treat strings as UTF8.
-     * @returns {Dish | Promise} - (Broswer) A promise | (Node) value of dish in given type
+     * @returns {Dish | Promise} - (Browser) A promise | (Node) value of dish in given type
     */
    presentAs(type, notUTF8=false) {
        const clone = this.clone();
--- a/src/core/Utils.mjs
+++ b/src/core/Utils.mjs
@@ -201,9 +201,8 @@ class Utils {
     * Utils.parseEscapedChars("\\n");
     */
    static parseEscapedChars(str) {
-        return str.replace(/(\\)?\\([bfnrtv'"]|[0-3][0-7]{2}|[0-7]{1,2}|x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{[\da-fA-F]{1,6}\}|\\)/g, function(m, a, b) {
-            if (a === "\\") return "\\"+b;
-            switch (b[0]) {
+        return str.replace(/\\([bfnrtv'"]|[0-3][0-7]{2}|[0-7]{1,2}|x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{[\da-fA-F]{1,6}\}|\\)/g, function(m, a) {
+            switch (a[0]) {
                case "\\":
                    return "\\";
                case "0":
@@ -214,7 +213,7 @@ class Utils {
                case "5":
                case "6":
                case "7":
-                    return String.fromCharCode(parseInt(b, 8));
+                    return String.fromCharCode(parseInt(a, 8));
                case "b":
                    return "\b";
                case "t":
@@ -232,12 +231,12 @@ class Utils {
                case "'":
                    return "'";
                case "x":
-                    return String.fromCharCode(parseInt(b.substr(1), 16));
+                    return String.fromCharCode(parseInt(a.substr(1), 16));
                case "u":
-                    if (b[1] === "{")
-                        return String.fromCodePoint(parseInt(b.slice(2, -1), 16));
+                    if (a[1] === "{")
+                        return String.fromCodePoint(parseInt(a.slice(2, -1), 16));
                    else
-                        return String.fromCharCode(parseInt(b.substr(1), 16));
+                        return String.fromCharCode(parseInt(a.substr(1), 16));
            }
        });
    }
--- a/src/core/config/Categories.json
+++ b/src/core/config/Categories.json
@@ -123,6 +123,7 @@
            "Generate PGP Key Pair",
            "PGP Encrypt",
            "PGP Decrypt",
+            "PGP Verify",
            "PGP Encrypt and Sign",
            "PGP Decrypt and Verify",
            "Parse SSH Host Key"
@@ -284,6 +285,7 @@
            "Zip",
            "Unzip",
            "Bzip2 Decompress",
+            "Bzip2 Compress",
            "Tar",
            "Untar"
        ]
@@ -370,6 +372,7 @@
            "Detect File Type",
            "Scan for Embedded Files",
            "Extract Files",
+            "YARA Rules",
            "Remove EXIF",
            "Extract EXIF",
            "Extract RGBA",
@@ -401,6 +404,7 @@
            "Cover Image",
            "Image Hue/Saturation/Lightness",
            "Sharpen Image",
+            "Normalise Image",
            "Convert Image Format",
            "Add Text To Image",
            "Hex Density chart",
--- a/src/core/errors/index.mjs
+++ b/src/core/errors/index.mjs
@@ -0,0 +1,9 @@
+import OperationError from "./OperationError.mjs";
+import DishError from "./DishError.mjs";
+import ExcludedOperationError from "./ExcludedOperationError";
+
+export {
+    OperationError,
+    DishError,
+    ExcludedOperationError,
+};
--- a/src/core/lib/BCD.mjs
+++ b/src/core/lib/BCD.mjs
@@ -22,7 +22,7 @@ export const ENCODING_SCHEME = [
 /**
 * Lookup table for the binary value of each digit representation.
 *
- * I wrote a very nice algorithm to generate 8 4 2 1 encoding programatically,
+ * I wrote a very nice algorithm to generate 8 4 2 1 encoding programmatically,
 * but unfortunately it's much easier (if less elegant) to use lookup tables
 * when supporting multiple encoding schemes.
 *
--- a/src/core/lib/Base64.mjs
+++ b/src/core/lib/Base64.mjs
@@ -7,7 +7,7 @@
 */

 import Utils from "../Utils.mjs";
-
+import OperationError from "../errors/OperationError.mjs";

 /**
 * Base64's the input byte array using the given alphabet, returning a string.
@@ -33,6 +33,9 @@ export function toBase64(data, alphabet="A-Za-z0-9+/=") {
    }

    alphabet = Utils.expandAlphRange(alphabet).join("");
+    if (alphabet.length !== 64 && alphabet.length !== 65) { // Allow for padding
+        throw new OperationError(`Invalid Base64 alphabet length (${alphabet.length}): ${alphabet}`);
+    }

    let output = "",
        chr1, chr2, chr3,
@@ -86,6 +89,9 @@ export function fromBase64(data, alphabet="A-Za-z0-9+/=", returnType="string", r

    alphabet = alphabet || "A-Za-z0-9+/=";
    alphabet = Utils.expandAlphRange(alphabet).join("");
+    if (alphabet.length !== 64 && alphabet.length !== 65) { // Allow for padding
+        throw new OperationError(`Invalid Base64 alphabet length (${alphabet.length}): ${alphabet}`);
+    }

    const output = [];
    let chr1, chr2, chr3,
--- a/src/core/lib/Delim.mjs
+++ b/src/core/lib/Delim.mjs
@@ -32,7 +32,7 @@ export const WORD_DELIM_OPTIONS = ["Line feed", "CRLF", "Forward slash", "Backsl
 export const INPUT_DELIM_OPTIONS = ["Line feed", "CRLF", "Space", "Comma", "Semi-colon", "Colon", "Nothing (separate chars)"];

 /**
- * Armithmetic sequence delimiters
+ * Arithmetic sequence delimiters
 */
 export const ARITHMETIC_DELIM_OPTIONS = ["Line feed", "Space", "Comma", "Semi-colon", "Colon", "CRLF"];

--- a/src/core/lib/FileSignatures.mjs
+++ b/src/core/lib/FileSignatures.mjs
@@ -415,7 +415,59 @@ export const FILE_SIGNATURES = {
                6: 0x30
            },
            extractor: null
-        }
+        },
+        {
+            name: "AutoCAD Drawing",
+            extension: "dwg,123d",
+            mime: "application/acad",
+            description: "",
+            signature: {
+                0: 0x41,
+                1: 0x43,
+                2: 0x31,
+                3: 0x30,
+                4: [0x30, 0x31],
+                5: [0x30, 0x31, 0x32, 0x33, 0x34, 0x35],
+                6: 0x00
+            },
+            extractor: null
+        },
+        {
+            name: "AutoCAD Drawing",
+            extension: "dwg,dwt",
+            mime: "application/acad",
+            description: "",
+            signature: [
+                {
+                    0: 0x41,
+                    1: 0x43,
+                    2: 0x31,
+                    3: 0x30,
+                    4: 0x31,
+                    5: 0x38,
+                    6: 0x00
+                },
+                {
+                    0: 0x41,
+                    1: 0x43,
+                    2: 0x31,
+                    3: 0x30,
+                    4: 0x32,
+                    5: 0x34,
+                    6: 0x00
+                },
+                {
+                    0: 0x41,
+                    1: 0x43,
+                    2: 0x31,
+                    3: 0x30,
+                    4: 0x32,
+                    5: 0x37,
+                    6: 0x00
+                }
+            ],
+            extractor: null
+        },
    ],
    "Video": [
        { // Place before webm
@@ -614,6 +666,59 @@ export const FILE_SIGNATURES = {
            },
            extractor: extractFLV
        },
+        {
+            name: "OGG Video",
+            extension: "ogv,ogm,opus,ogx",
+            mime: "video/ogg",
+            description: "",
+            signature: [
+                {
+                    0: 0x4f, // OggS
+                    1: 0x67,
+                    2: 0x67,
+                    3: 0x53,
+                    4: 0x00,
+                    5: 0x02,
+                    28: 0x01,
+                    29: 0x76, // video
+                    30: 0x69,
+                    31: 0x64,
+                    32: 0x65,
+                    33: 0x6f
+                },
+                {
+                    0: 0x4f, // OggS
+                    1: 0x67,
+                    2: 0x67,
+                    3: 0x53,
+                    4: 0x00,
+                    5: 0x02,
+                    28: 0x80,
+                    29: 0x74, // theora
+                    30: 0x68,
+                    31: 0x65,
+                    32: 0x6f,
+                    33: 0x72,
+                    34: 0x61
+                },
+                {
+                    0: 0x4f, // OggS
+                    1: 0x67,
+                    2: 0x67,
+                    3: 0x53,
+                    4: 0x00,
+                    5: 0x02,
+                    28: 0x66, // fishead
+                    29: 0x69,
+                    30: 0x73,
+                    31: 0x68,
+                    32: 0x65,
+                    33: 0x61,
+                    34: 0x64
+                }
+            ],
+            extractor: null
+        },
    ],
    "Audio": [
        {
@@ -881,6 +986,19 @@ export const FILE_SIGNATURES = {
            },
            extractor: null
        },
+        {
+            name: "Encapsulated PostScript",
+            extension: "eps,ai",
+            mime: "application/eps",
+            description: "",
+            signature: {
+                0: 0xc5,
+                1: 0xd0,
+                2: 0xd3,
+                3: 0xc6
+            },
+            extractor: null
+        },
        {
            name: "Rich Text Format",
            extension: "rtf",
@@ -1074,6 +1192,22 @@ export const FILE_SIGNATURES = {
            },
            extractor: null
        },
+        {
+            name: "WordPerfect document",
+            extension: "wpd,wp,wp5,wp6,wpp,bk!,wcm",
+            mime: "application/wordperfect",
+            description: "",
+            signature: {
+                0: 0xff,
+                1: 0x57,
+                2: 0x50,
+                3: 0x43,
+                7: [0x00, 0x01, 0x02],
+                8: 0x01,
+                9: 0x0a
+            },
+            extractor: null
+        },
        {
            name: "EPUB e-book",
            extension: "epub",
@@ -1120,7 +1254,7 @@ export const FILE_SIGNATURES = {
        {
            name: "Windows Portable Executable",
            extension: "exe,dll,drv,vxd,sys,ocx,vbx,com,fon,scr",
-            mime: "application/x-msdownload",
+            mime: "application/vnd.microsoft.portable-executable",
            description: "",
            signature: {
                0: 0x4d,
@@ -1131,7 +1265,7 @@ export const FILE_SIGNATURES = {
            extractor: extractMZPE
        },
        {
-            name: "Executable and Linkable Format file",
+            name: "Executable and Linkable Format",
            extension: "elf,bin,axf,o,prx,so",
            mime: "application/x-executable",
            description: "Executable and Linkable Format file. No standard file extension.",
@@ -1144,7 +1278,7 @@ export const FILE_SIGNATURES = {
            extractor: extractELF
        },
        {
-            name: "MacOS Mach-O object file",
+            name: "MacOS Mach-O object",
            extension: "dylib",
            mime: "application/octet-stream",
            description: "",
@@ -1161,7 +1295,7 @@ export const FILE_SIGNATURES = {
            extractor: null
        },
        {
-            name: "MacOS Mach-O 64-bit object file",
+            name: "MacOS Mach-O 64-bit object",
            extension: "dylib",
            mime: "application/octet-stream",
            description: "",
@@ -1549,7 +1683,7 @@ export const FILE_SIGNATURES = {
            extractor: null
        },
        {
-            name: "Microsoft Cabinet file",
+            name: "Microsoft Cabinet",
            extension: "cab",
            mime: "vnd.ms-cab-compressed",
            description: "",
@@ -1578,10 +1712,27 @@ export const FILE_SIGNATURES = {
            },
            extractor: null
        },
+        {
+            name: "lzop compressed",
+            extension: "lzop,lzo",
+            mime: "application/x-lzop",
+            description: "",
+            signature: {
+                0: 0x89,
+                1: 0x4c, // LZO
+                2: 0x5a,
+                3: 0x4f,
+                4: 0x00,
+                5: 0x0d,
+                6: 0x0a,
+                7: 0x1a
+            },
+            extractor: null
+        },
    ],
    "Miscellaneous": [
        {
-            name: "UTF-8 text file",
+            name: "UTF-8 text",
            extension: "txt",
            mime: "text/plain",
            description: "UTF-8 encoded Unicode byte order mark, commonly but not exclusively seen in text files.",
@@ -1592,8 +1743,8 @@ export const FILE_SIGNATURES = {
            },
            extractor: null
        },
-        { // Place before UTF-16 LE file
-            name: "UTF-32 LE file",
+        { // Place before UTF-16 LE text
+            name: "UTF-32 LE text",
            extension: "utf32le",
            mime: "charset/utf32le",
            description: "Little-endian UTF-32 encoded Unicode byte order mark.",
@@ -1606,7 +1757,7 @@ export const FILE_SIGNATURES = {
            extractor: null
        },
        {
-            name: "UTF-16 LE file",
+            name: "UTF-16 LE text",
            extension: "utf16le",
            mime: "charset/utf16le",
            description: "Little-endian UTF-16 encoded Unicode byte order mark.",
@@ -1964,6 +2115,223 @@ export const FILE_SIGNATURES = {
            },
            extractor: null
        },
+        {
+            name: "TCP Packet",
+            extension: "tcp",
+            mime: "application/tcp",
+            description: "",
+            signature: {
+                12: 0x08,
+                13: 0x00,
+                14: 0x45,
+                15: 0x00,
+                21: 0x00,
+                22: b => b >= 0x01 && b <= 0x80,
+                23: 0x06
+            },
+            extractor: null
+        },
+        {
+            name: "UDP Packet",
+            extension: "udp",
+            mime: "application/udp",
+            description: "",
+            signature: {
+                12: 0x08,
+                13: 0x00,
+                14: 0x45,
+                15: 0x00,
+                16: [0x00, 0x01, 0x02, 0x03, 0x04, 0x05],
+                22: b => b >= 0x01 && b <= 0x80,
+                23: 0x11
+            },
+            extractor: null
+        },
+        {
+            name: "Compiled HTML",
+            extension: "chm,chw,chi",
+            mime: "application/vnd.ms-htmlhelp",
+            description: "",
+            signature: {
+                0: 0x49, // ITSF
+                1: 0x54,
+                2: 0x53,
+                3: 0x46,
+                4: 0x03,
+                5: 0x00,
+                6: 0x00,
+                7: 0x00
+            },
+            extractor: null
+        },
+        {
+            name: "Windows Password",
+            extension: "pwl",
+            mime: "application/octet-stream",
+            description: "",
+            signature: {
+                0: 0xe3,
+                1: 0x82,
+                2: 0x85,
+                3: 0x96
+            },
+            extractor: null
+        },
+        {
+            name: "Bitlocker recovery key",
+            extension: "bitlocker",
+            mime: "application/octet-stream",
+            description: "",
+            signature: {
+                0: 0xff,
+                1: 0xfe,
+                2: 0x42,
+                3: 0x00,
+                4: 0x69,
+                5: 0x00,
+                6: 0x74,
+                7: 0x00,
+                8: 0x4c,
+                9: 0x00,
+                10: 0x6f,
+                11: 0x00,
+                12: 0x63,
+                13: 0x00,
+                14: 0x6b,
+                15: 0x00,
+                16: 0x65,
+                17: 0x00,
+                18: 0x72,
+                19: 0x00,
+                20: 0x20,
+                21: 0x00
+            },
+            extractor: null
+        },
+        {
+            name: "Certificate",
+            extension: "cer,cat,p7b,p7c,p7m,p7s,swz,rsa,crl,crt,der",
+            mime: "application/pkix-cert",
+            description: "",
+            signature: {
+                0: 0x30,
+                1: 0x82,
+                4: [0x06, 0x0a, 0x30]
+            },
+            extractor: null
+        },
+        {
+            name: "Certificate",
+            extension: "cat,swz,p7m",
+            mime: "application/vnd.ms-pki.seccat",
+            description: "",
+            signature: {
+                0: 0x30,
+                1: 0x83,
+                2: b => b !== 0x00,
+                5: 0x06,
+                6: 0x09
+            },
+            extractor: null
+        },
+        {
+            name: "PGP pubring",
+            extension: "pkr,gpg",
+            mime: "application/pgp-keys",
+            description: "",
+            signature: {
+                0: 0x99,
+                1: 0x01,
+                2: [0x0d, 0xa2],
+                3: 0x04
+            },
+            extractor: null
+        },
+        {
+            name: "PGP secring",
+            extension: "skr",
+            mime: "application/pgp-keys",
+            description: "",
+            signature: [
+                {
+                    0: 0x95,
+                    1: 0x01,
+                    2: 0xcf,
+                    3: 0x04
+                },
+                {
+                    0: 0x95,
+                    1: 0x03,
+                    2: 0xc6,
+                    3: 0x04
+                }
+            ],
+            extractor: null
+        },
+        {
+            name: "PGP Safe",
+            extension: "pgd",
+            mime: "application/pgp-keys",
+            description: "",
+            signature: {
+                0: 0x50, // PGPdMAIN
+                1: 0x47,
+                2: 0x50,
+                3: 0x64,
+                4: 0x4d,
+                5: 0x41,
+                6: 0x49,
+                7: 0x4e,
+                8: 0x60,
+                9: 0x01,
+                10: 0x00
+            },
+            extractor: null
+        },
+        {
+            name: "Task Scheduler",
+            extension: "job",
+            mime: "application/octet-stream",
+            description: "",
+            signature: {
+                0: [0x00, 0x01, 0x02, 0x03],
+                1: [0x05, 0x06],
+                2: 0x01,
+                3: 0x00,
+                20: 0x46,
+                21: 0x00
+            },
+            extractor: null
+        },
+        {
+            name: "Windows Shortcut",
+            extension: "lnk",
+            mime: "application/x-ms-shortcut",
+            description: "",
+            signature: {
+                0: 0x4c,
+                1: 0x00,
+                2: 0x00,
+                3: 0x00,
+                4: 0x01,
+                5: 0x14,
+                6: 0x02,
+                7: 0x00,
+                8: 0x00,
+                9: 0x00,
+                10: 0x00,
+                11: 0x00,
+                12: 0xc0,
+                13: 0x00,
+                14: 0x00,
+                15: 0x00,
+                16: 0x00,
+                17: 0x00,
+                18: 0x00,
+                19: 0x46
+            },
+            extractor: null
+        }
    ]
 };

@@ -2083,7 +2451,7 @@ export function extractJPEG(bytes, offset) {
 export function extractMZPE(bytes, offset) {
    const stream = new Stream(bytes.slice(offset));

-    // Move to PE header pointer
+    // Read pointer to PE header
    stream.moveTo(0x3c);
    const peAddress = stream.readInt(4, "le");

@@ -2094,12 +2462,36 @@ export function extractMZPE(bytes, offset) {
    stream.moveForwardsBy(6);
    const numSections = stream.readInt(2, "le");

-    // Get optional header size
-    stream.moveForwardsBy(12);
-    const optionalHeaderSize = stream.readInt(2, "le");
+    // Read Optional Header Magic to determine the state of the image file
+    // 0x10b = normal executable, 0x107 = ROM image, 0x20b = PE32+ executable
+    stream.moveForwardsBy(16);
+    const optionalMagic = stream.readInt(2, "le");
+    const pe32Plus = optionalMagic === 0x20b;

-    // Move past optional header to section header
-    stream.moveForwardsBy(2 + optionalHeaderSize);
+    // Move to Data Directory
+    const dataDirectoryOffset = pe32Plus ? 112 : 96;
+    stream.moveForwardsBy(dataDirectoryOffset - 2);
+
+    // Read Certificate Table address and size (IMAGE_DIRECTORY_ENTRY_SECURITY)
+    stream.moveForwardsBy(32);
+    const certTableAddress = stream.readInt(4, "le");
+    const certTableSize = stream.readInt(4, "le");
+
+    // PE files can contain extra data appended to the end of the file called an "overlay".
+    // This data is not covered by the PE header and could be any arbitrary format, so its
+    // length cannot be determined without contextual information.
+    // However, the Attribute Certificate Table is stored in the overlay - usually right at
+    // the end. Therefore, if this table is defined, we can use its offset and size to carve
+    // out the entire PE file, including the overlay.
+    // If the Certificate Table is not defined, we continue to parse the PE file as best we
+    // can up to the end of the final section, not including any appended data in the overlay.
+    if (certTableAddress > 0) {
+        stream.moveTo(certTableAddress + certTableSize);
+        return stream.carve();
+    }
+
+    // Move past Optional Header to Section Header
+    stream.moveForwardsBy(88);

    // Move to final section header
    stream.moveForwardsBy((numSections - 1) * 0x28);
@@ -2307,9 +2699,10 @@ export function extractRTF(bytes, offset) {
 export function extractPListXML(bytes, offset) {
    const stream = new Stream(bytes.slice(offset));

-    // Find closing tag (</plist>\n)
-    stream.continueUntil([0x3c, 0x2f, 0x70, 0x6c, 0x69, 0x73, 0x74, 0x3e, 0x0a]);
-    stream.moveForwardsBy(9);
+    // Find closing tag (</plist>)
+    stream.continueUntil([0x3c, 0x2f, 0x70, 0x6c, 0x69, 0x73, 0x74, 0x3e]);
+    stream.moveForwardsBy(8);
+    stream.consumeIf(0x0a);

    return stream.carve();
 }
--- a/src/core/lib/FileType.mjs
+++ b/src/core/lib/FileType.mjs
@@ -178,7 +178,7 @@ export function scanForFileTypes(buf, categories=Object.keys(FILE_SIGNATURES)) {
 * @param {Uint8Array} buf - The buffer to search
 * @param {Object} sig - A single signature object (Not an array of signatures)
 * @param {number} offset - Where to start search from
- * @returs {number} The position of the match or -1 if one cannot be found.
+ * @returns {number} The position of the match or -1 if one cannot be found.
 */
 function locatePotentialSig(buf, sig, offset) {
    // Find values for first key and value in sig
--- a/src/core/lib/Magic.mjs
+++ b/src/core/lib/Magic.mjs
@@ -97,6 +97,7 @@ class Magic {

        if (!fileType.length) return null;
        return {
+            name: fileType[0].name,
            ext: fileType[0].extension,
            mime: fileType[0].mime,
            desc: fileType[0].description
@@ -354,17 +355,17 @@ class Magic {
            let aScore = a.languageScores[0].score,
                bScore = b.languageScores[0].score;

-            // If a recipe results in a file being detected, it receives a relatively good score
-            if (a.fileType) aScore = 500;
-            if (b.fileType) bScore = 500;
-
            // If the result is valid UTF8, its score gets boosted (lower being better)
            if (a.isUTF8) aScore -= 100;
            if (b.isUTF8) bScore -= 100;

+            // If a recipe results in a file being detected, it receives a relatively good score
+            if (a.fileType && aScore > 500) aScore = 500;
+            if (b.fileType && bScore > 500) bScore = 500;
+
            // If the option is marked useful, give it a good score
-            if (a.useful) aScore = 100;
-            if (b.useful) bScore = 100;
+            if (a.useful && aScore > 100) aScore = 100;
+            if (b.useful && bScore > 100) bScore = 100;

            // Shorter recipes are better, so we add the length of the recipe to the score
            aScore += a.recipe.length;
@@ -497,7 +498,7 @@ class Magic {
     * Taken from http://wikistats.wmflabs.org/display.php?t=wp
     *
     * @param {string} code - ISO 639 code
-     * @returns {string} The full name of the languge
+     * @returns {string} The full name of the language
     */
    static codeToLanguage(code) {
        return {
--- a/src/core/lib/QRCode.mjs
+++ b/src/core/lib/QRCode.mjs
@@ -37,7 +37,7 @@ export async function parseQrCode(input, normalise) {
            image = await jimp.read(image);
        }
    } catch (err) {
-        throw new OperationError(`Error normalising iamge. (${err})`);
+        throw new OperationError(`Error normalising image. (${err})`);
    }

    const qrData = jsQR(image.bitmap.data, image.getWidth(), image.getHeight());
--- a/src/core/operations/BLAKE2b.mjs
+++ b/src/core/operations/BLAKE2b.mjs
@@ -50,7 +50,7 @@ class BLAKE2b extends Operation {
    /**
     * @param {ArrayBuffer} input
     * @param {Object[]} args
-     * @returns {string} The input having been hashed with BLAKE2b in the encoding format speicifed.
+     * @returns {string} The input having been hashed with BLAKE2b in the encoding format specified.
     */
    run(input, args) {
        const [outSize, outFormat] = args;
--- a/src/core/operations/BLAKE2s.mjs
+++ b/src/core/operations/BLAKE2s.mjs
@@ -51,7 +51,7 @@ class BLAKE2s extends Operation {
    /**
     * @param {ArrayBuffer} input
     * @param {Object[]} args
-     * @returns {string} The input having been hashed with BLAKE2s in the encoding format speicifed.
+     * @returns {string} The input having been hashed with BLAKE2s in the encoding format specified.
     */
    run(input, args) {
        const [outSize, outFormat] = args;
--- a/src/core/operations/Bzip2Decompress.mjs
+++ b/src/core/operations/Bzip2Decompress.mjs
@@ -47,7 +47,7 @@ class Bzip2Decompress extends Operation {
     * @param {Object[]} args
     * @returns {string}
     */
-    run(input, args) {
+    async run(input, args) {
        const [small] = args;
        if (input.byteLength <= 0) {
            throw new OperationError("Please provide an input.");
--- a/src/core/operations/DESDecrypt.mjs
+++ b/src/core/operations/DESDecrypt.mjs
@@ -73,6 +73,12 @@ class DESDecrypt extends Operation {
 DES uses a key length of 8 bytes (64 bits).
 Triple DES uses a key length of 24 bytes (192 bits).`);
        }
+        if (iv.length !== 8 && mode !== "ECB") {
+            throw new OperationError(`Invalid IV length: ${iv.length} bytes
+
+DES uses an IV length of 8 bytes (64 bits).
+Make sure you have specified the type correctly (e.g. Hex vs UTF8).`);
+        }

        input = Utils.convertToByteString(input, inputType);

--- a/src/core/operations/DESEncrypt.mjs
+++ b/src/core/operations/DESEncrypt.mjs
@@ -73,6 +73,12 @@ class DESEncrypt extends Operation {
 DES uses a key length of 8 bytes (64 bits).
 Triple DES uses a key length of 24 bytes (192 bits).`);
        }
+        if (iv.length !== 8 && mode !== "ECB") {
+            throw new OperationError(`Invalid IV length: ${iv.length} bytes
+
+DES uses an IV length of 8 bytes (64 bits).
+Make sure you have specified the type correctly (e.g. Hex vs UTF8).`);
+        }

        input = Utils.convertToByteString(input, inputType);

--- a/src/core/operations/DetectFileType.mjs
+++ b/src/core/operations/DetectFileType.mjs
@@ -8,6 +8,13 @@ import Operation from "../Operation.mjs";
 import {detectFileType} from "../lib/FileType.mjs";
 import {FILE_SIGNATURES} from "../lib/FileSignatures.mjs";

+// Concat all supported extensions into a single flat list
+const exts = [].concat.apply([], Object.keys(FILE_SIGNATURES).map(cat =>
+    [].concat.apply([], FILE_SIGNATURES[cat].map(sig =>
+        sig.extension.split(",")
+    ))
+)).unique().sort().join(", ");
+
 /**
 * Detect File Type operation
 */
@@ -22,11 +29,7 @@ class DetectFileType extends Operation {
        this.name = "Detect File Type";
        this.module = "Default";
        this.description = "Attempts to guess the MIME (Multipurpose Internet Mail Extensions) type of the data based on 'magic bytes'.<br><br>Currently supports the following file types: " +
-            Object.keys(FILE_SIGNATURES).map(cat =>
-                [].concat.apply([], FILE_SIGNATURES[cat].map(sig =>
-                    sig.extension.split(",")
-                )).unique().join(", ")
-            ).unique().join(", ") + ".";
+            exts + ".";
        this.infoURL = "https://wikipedia.org/wiki/List_of_file_signatures";
        this.inputType = "ArrayBuffer";
        this.outputType = "string";
--- a/src/core/operations/Diff.mjs
+++ b/src/core/operations/Diff.mjs
@@ -47,6 +47,11 @@ class Diff extends Operation {
                "type": "boolean",
                "value": true
            },
+            {
+                "name": "Show subtraction",
+                "type": "boolean",
+                "value": false
+            },
            {
                "name": "Ignore whitespace",
                "type": "boolean",
@@ -67,6 +72,7 @@ class Diff extends Operation {
                diffBy,
                showAdded,
                showRemoved,
+                showSubtraction,
                ignoreWhitespace
            ] = args,
            samples = input.split(sampleDelim);
@@ -116,7 +122,7 @@ class Diff extends Operation {
                if (showAdded) output += "<span class='hl5'>" + Utils.escapeHtml(diff[i].value) + "</span>";
            } else if (diff[i].removed) {
                if (showRemoved) output += "<span class='hl3'>" + Utils.escapeHtml(diff[i].value) + "</span>";
-            } else {
+            } else if (!showSubtraction) {
                output += Utils.escapeHtml(diff[i].value);
            }
        }
--- a/src/core/operations/Fork.mjs
+++ b/src/core/operations/Fork.mjs
@@ -76,8 +76,8 @@ class Fork extends Operation {
        }

        const recipe = new Recipe();
-        let output = "",
-            progress = 0;
+        const outputs = [];
+        let progress = 0;

        state.forkOffset += state.progress + 1;

@@ -104,10 +104,10 @@ class Fork extends Operation {
                }
                progress = err.progress + 1;
            }
-            output += await dish.get(outputType) + mergeDelim;
+            outputs.push(await dish.get(outputType));
        }

-        state.dish.set(output, outputType);
+        state.dish.set(outputs.join(mergeDelim), outputType);
        state.progress += progress;
        return state;
    }
--- a/src/core/operations/GeneratePGPKeyPair.mjs
+++ b/src/core/operations/GeneratePGPKeyPair.mjs
@@ -58,7 +58,7 @@ class GeneratePGPKeyPair extends Operation {
     * @param {Object[]} args
     * @returns {string}
     */
-    run(input, args) {
+    async run(input, args) {
        const [keyType, keySize] = args[0].split("-"),
            password = args[1],
            name = args[2],
--- a/src/core/operations/HammingDistance.mjs
+++ b/src/core/operations/HammingDistance.mjs
@@ -57,7 +57,7 @@ class HammingDistance extends Operation {
            samples = input.split(delim);

        if (samples.length !== 2) {
-            throw new OperationError("Error: You can only calculae the edit distance between 2 strings. Please ensure exactly two inputs are provided, separated by the specified delimiter.");
+            throw new OperationError("Error: You can only calculate the edit distance between 2 strings. Please ensure exactly two inputs are provided, separated by the specified delimiter.");
        }

        if (samples[0].length !== samples[1].length) {
--- a/src/core/operations/PHPDeserialize.mjs
+++ b/src/core/operations/PHPDeserialize.mjs
@@ -128,8 +128,7 @@ class PHPDeserialize extends Operation {
            switch (kind) {
                case "n":
                    expect(";");
-                    return "";
-
+                    return "null";
                case "i":
                case "d":
                case "b": {
--- a/src/core/operations/RawInflate.mjs
+++ b/src/core/operations/RawInflate.mjs
@@ -77,7 +77,7 @@ class RawInflate extends Operation {
            }),
            result = new Uint8Array(inflate.decompress());

-        // Raw Inflate somethimes messes up and returns nonsense like this:
+        // Raw Inflate sometimes messes up and returns nonsense like this:
        // ]....]....]....]....]....]....]....]....]....]....]....]....]....]...
        // e.g. Input data of [8b, 1d, dc, 44]
        // Look for the first two square brackets:
--- a/src/core/operations/RemoveWhitespace.mjs
+++ b/src/core/operations/RemoveWhitespace.mjs
@@ -64,7 +64,7 @@ class RemoveWhitespace extends Operation {
    run(input, args) {
        const [
            removeSpaces,
-            removeCariageReturns,
+            removeCarriageReturns,
            removeLineFeeds,
            removeTabs,
            removeFormFeeds,
@@ -73,7 +73,7 @@ class RemoveWhitespace extends Operation {
        let data = input;

        if (removeSpaces) data = data.replace(/ /g, "");
-        if (removeCariageReturns) data = data.replace(/\r/g, "");
+        if (removeCarriageReturns) data = data.replace(/\r/g, "");
        if (removeLineFeeds) data = data.replace(/\n/g, "");
        if (removeTabs) data = data.replace(/\t/g, "");
        if (removeFormFeeds) data = data.replace(/\f/g, "");
--- a/src/core/operations/ToQuotedPrintable.mjs
+++ b/src/core/operations/ToQuotedPrintable.mjs
@@ -108,7 +108,7 @@ class ToQuotedPrintable extends Operation {
     * @private
     * @param {number} nr
     * @param {byteArray[]} ranges
-     * @returns {bolean}
+     * @returns {boolean}
     */
    _checkRanges(nr, ranges) {
        for (let i = ranges.length - 1; i >= 0; i--) {
--- a/src/core/operations/TripleDESDecrypt.mjs
+++ b/src/core/operations/TripleDESDecrypt.mjs
@@ -75,6 +75,12 @@ class TripleDESDecrypt extends Operation {
 Triple DES uses a key length of 24 bytes (192 bits).
 DES uses a key length of 8 bytes (64 bits).`);
        }
+        if (iv.length !== 8 && mode !== "ECB") {
+            throw new OperationError(`Invalid IV length: ${iv.length} bytes
+
+Triple DES uses an IV length of 8 bytes (64 bits).
+Make sure you have specified the type correctly (e.g. Hex vs UTF8).`);
+        }

        input = Utils.convertToByteString(input, inputType);

--- a/src/core/operations/TripleDESEncrypt.mjs
+++ b/src/core/operations/TripleDESEncrypt.mjs
@@ -75,6 +75,12 @@ class TripleDESEncrypt extends Operation {
 Triple DES uses a key length of 24 bytes (192 bits).
 DES uses a key length of 8 bytes (64 bits).`);
        }
+        if (iv.length !== 8 && mode !== "ECB") {
+            throw new OperationError(`Invalid IV length: ${iv.length} bytes
+
+Triple DES uses an IV length of 8 bytes (64 bits).
+Make sure you have specified the type correctly (e.g. Hex vs UTF8).`);
+        }

        input = Utils.convertToByteString(input, inputType);

--- a/src/core/operations/Typex.mjs
+++ b/src/core/operations/Typex.mjs
@@ -23,7 +23,7 @@ class Typex extends Operation {

        this.name = "Typex";
        this.module = "Default";
-        this.description = "Encipher/decipher with the WW2 Typex machine.<br><br>Typex was originally built by the British Royal Air Force prior to WW2, and is based on the Enigma machine with some improvements made, including using five rotors with more stepping points and interchangeable wiring cores. It was used across the British and Commonewealth militaries. A number of later variants were produced; here we simulate a WW2 era Mark 22 Typex with plugboards for the reflector and input. Typex rotors were changed regularly and none are public: a random example set are provided.<br><br>To configure the reflector plugboard, enter a string of connected pairs of letters in the reflector box, e.g. <code>AB CD EF</code> connects A to B, C to D, and E to F (you'll need to connect every letter). There is also an input plugboard: unlike Enigma's plugboard, it's not restricted to pairs, so it's entered like a rotor (without stepping). To create your own rotor, enter the letters that the rotor maps A to Z to, in order, optionally followed by <code>&lt;</code> then a list of stepping points.<br><br>More detailed descriptions of the Enigma, Typex and Bombe operations <a href='https://github.com/gchq/CyberChef/wiki/Enigma,-the-Bombe,-and-Typex'>can be found here</a>.";
+        this.description = "Encipher/decipher with the WW2 Typex machine.<br><br>Typex was originally built by the British Royal Air Force prior to WW2, and is based on the Enigma machine with some improvements made, including using five rotors with more stepping points and interchangeable wiring cores. It was used across the British and Commonwealth militaries. A number of later variants were produced; here we simulate a WW2 era Mark 22 Typex with plugboards for the reflector and input. Typex rotors were changed regularly and none are public: a random example set are provided.<br><br>To configure the reflector plugboard, enter a string of connected pairs of letters in the reflector box, e.g. <code>AB CD EF</code> connects A to B, C to D, and E to F (you'll need to connect every letter). There is also an input plugboard: unlike Enigma's plugboard, it's not restricted to pairs, so it's entered like a rotor (without stepping). To create your own rotor, enter the letters that the rotor maps A to Z to, in order, optionally followed by <code>&lt;</code> then a list of stepping points.<br><br>More detailed descriptions of the Enigma, Typex and Bombe operations <a href='https://github.com/gchq/CyberChef/wiki/Enigma,-the-Bombe,-and-Typex'>can be found here</a>.";
        this.infoURL = "https://wikipedia.org/wiki/Typex";
        this.inputType = "string";
        this.outputType = "string";
--- a/src/core/operations/UNIXTimestampToWindowsFiletime.mjs
+++ b/src/core/operations/UNIXTimestampToWindowsFiletime.mjs
@@ -56,7 +56,7 @@ class UNIXTimestampToWindowsFiletime extends Operation {
        } else if (units === "Milliseconds (ms)") {
            input = input.multipliedBy(new BigNumber("10000"));
        } else if (units === "Microseconds (μs)") {
-            input = input.multiplyiedBy(new BigNumber("10"));
+            input = input.multipliedBy(new BigNumber("10"));
        } else if (units === "Nanoseconds (ns)") {
            input = input.dividedBy(new BigNumber("100"));
        } else {
--- a/src/core/operations/URLEncode.mjs
+++ b/src/core/operations/URLEncode.mjs
@@ -49,7 +49,7 @@ class URLEncode extends Operation {
     * @returns {string}
     */
    encodeAllChars (str) {
-        // TODO Do this programatically
+        // TODO Do this programmatically
        return encodeURIComponent(str)
            .replace(/!/g, "%21")
            .replace(/#/g, "%23")
--- a/src/core/operations/VigenèreDecode.mjs
+++ b/src/core/operations/VigenèreDecode.mjs
@@ -55,7 +55,7 @@ class VigenèreDecode extends Operation {
                keyIndex = alphabet.indexOf(chr);
                msgIndex = alphabet.indexOf(input[i]);
                // Subtract indexes from each other, add 26 just in case the value is negative,
-                // modulo to remove if neccessary
+                // modulo to remove if necessary
                output += alphabet[(msgIndex - keyIndex + alphabet.length) % 26];
            } else if (alphabet.indexOf(input[i].toLowerCase()) >= 0) {
                chr = key[(i - fail) % key.length].toLowerCase();
--- a/src/core/operations/Whirlpool.mjs
+++ b/src/core/operations/Whirlpool.mjs
@@ -20,7 +20,7 @@ class Whirlpool extends Operation {

        this.name = "Whirlpool";
        this.module = "Crypto";
-        this.description = "Whirlpool is a cryptographic hash function designed by Vincent Rijmen (co-creator of AES) and Paulo S. L. M. Barreto, who first described it in 2000.<br><br>Several variants exist:<ul><li>Whirlpool-0 is the original version released in 2000.</li><li>Whirlpool-T is the first revision, released in 2001, improving the generation of the s-box.</li><li>Whirlpool is the latest revision, released in 2003, fixing a flaw in the difusion matrix.</li></ul>";
+        this.description = "Whirlpool is a cryptographic hash function designed by Vincent Rijmen (co-creator of AES) and Paulo S. L. M. Barreto, who first described it in 2000.<br><br>Several variants exist:<ul><li>Whirlpool-0 is the original version released in 2000.</li><li>Whirlpool-T is the first revision, released in 2001, improving the generation of the s-box.</li><li>Whirlpool is the latest revision, released in 2003, fixing a flaw in the diffusion matrix.</li></ul>";
        this.infoURL = "https://wikipedia.org/wiki/Whirlpool_(cryptography)";
        this.inputType = "ArrayBuffer";
        this.outputType = "string";
--- a/src/core/operations/YARARules.mjs
+++ b/src/core/operations/YARARules.mjs
@@ -61,7 +61,7 @@ class YARARules extends Operation {
     * @param {Object[]} args
     * @returns {string}
     */
-    run(input, args) {
+    async run(input, args) {
        if (isWorkerEnvironment())
            self.sendStatusMessage("Instantiating YARA...");
        const [rules, showStrings, showLengths, showMeta, showCounts] = args;
--- a/src/node/api.mjs
+++ b/src/node/api.mjs
@@ -12,7 +12,7 @@ import NodeDish from "./NodeDish.mjs";
 import NodeRecipe from "./NodeRecipe.mjs";
 import OperationConfig from "../core/config/OperationConfig.json";
 import { sanitise, removeSubheadingsFromArray, sentenceToCamelCase } from "./apiUtils.mjs";
-import ExludedOperationError from "../core/errors/ExcludedOperationError.mjs";
+import ExcludedOperationError from "../core/errors/ExcludedOperationError.mjs";


 /**
@@ -320,12 +320,12 @@ export function bake() {
 * Explain that the given operation is not included in the Node.js version.
 * @param {String} name - name of operation
 */
-export function _explainExludedFunction(name) {
+export function _explainExcludedFunction(name) {
    /**
     * Throw new error type with useful message.
    */
    const func = () => {
-        throw new ExludedOperationError(`Sorry, the ${name} operation is not available in the Node.js version of CyberChef.`);
+        throw new ExcludedOperationError(`Sorry, the ${name} operation is not available in the Node.js version of CyberChef.`);
    };
    // Add opName prop so NodeRecipe can handle it, just like wrap does.
    func.opName = name;
--- a/src/node/apiUtils.mjs
+++ b/src/node/apiUtils.mjs
@@ -71,7 +71,7 @@ export function sanitise(str) {


 /**
- * sonething like this => somethingLikeThis
+ * something like this => somethingLikeThis
 * ABC a sentence => ABCASentence
 */
 export function sentenceToCamelCase(str) {
--- a/src/node/config/excludedOperations.mjs
+++ b/src/node/config/excludedOperations.mjs
@@ -1,5 +1,5 @@
 /**
- * Operations to exlude from the Node API
+ * Operations to exclude from the Node API
 *
 * @author d98762656 [d98762625@gmail.com]
 * @copyright Crown Copyright 2018
--- a/src/node/config/scripts/generateNodeIndex.mjs
+++ b/src/node/config/scripts/generateNodeIndex.mjs
@@ -39,8 +39,9 @@ let code = `/**


 import NodeDish from "./NodeDish.mjs";
-import { _wrap, help, bake, _explainExludedFunction } from "./api.mjs";
+import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs";
 import File from "./File.mjs";
+import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index";
 import {
    // import as core_ to avoid name clashes after wrap.
 `;
@@ -69,7 +70,7 @@ includedOperations.forEach((op) => {
 });

 excludedOperations.forEach((op) => {
-    code += `        "${decapitalise(op)}": _explainExludedFunction("${op}"),\n`;
+    code += `        "${decapitalise(op)}": _explainExcludedFunction("${op}"),\n`;
 });

 code += `    };
@@ -115,6 +116,9 @@ Object.keys(operations).forEach((op) => {
 code += "    NodeDish as Dish,\n";
 code += "    prebaked as bake,\n";
 code += "    help,\n";
+code += "    OperationError,\n";
+code += "    ExcludedOperationError,\n";
+code += "    DishError,\n";
 code += "};\n";


--- a/src/web/App.mjs
+++ b/src/web/App.mjs
@@ -453,6 +453,7 @@ class App {
     * Searches the URI parameters for recipe and input parameters.
     * If recipe is present, replaces the current recipe with the recipe provided in the URI.
     * If input is present, decodes and sets the input to the one provided in the URI.
+     * If theme is present, uses the theme.
     *
     * @fires Manager#statechange
     */
@@ -491,6 +492,11 @@ class App {
            } catch (err) {}
        }

+        // Read in theme from URI params
+        if (this.uriParams.theme) {
+            this.manager.options.changeTheme(Utils.escapeHtml(this.uriParams.theme));
+        }
+
        this.autoBakePause = false;
        window.dispatchEvent(this.manager.statechange);
    }
--- a/src/web/HTMLIngredient.mjs
+++ b/src/web/HTMLIngredient.mjs
@@ -31,7 +31,9 @@ class HTMLIngredient {
        this.target = config.target;
        this.defaultIndex = config.defaultIndex || 0;
        this.toggleValues = config.toggleValues;
-        this.id = "ing-" + this.app.nextIngId();
+        this.ingId = this.app.nextIngId();
+        this.id = "ing-" + this.ingId;
+        this.tabIndex = this.ingId + 2; // Input = 1, Search = 2
        this.min = (typeof config.min === "number") ? config.min : "";
        this.max = (typeof config.max === "number") ? config.max : "";
        this.step = config.step || 1;
@@ -56,6 +58,7 @@ class HTMLIngredient {
                    <input type="text"
                        class="form-control arg"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        value="${this.value}"
                        ${this.disabled ? "disabled" : ""}>
@@ -69,6 +72,7 @@ class HTMLIngredient {
                    <input type="text"
                        class="form-control arg inline"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        value="${this.value}"
                        ${this.disabled ? "disabled" : ""}>
@@ -82,6 +86,7 @@ class HTMLIngredient {
                        <input type="text"
                            class="form-control arg toggle-string"
                            id="${this.id}"
+                            tabindex="${this.tabIndex}"
                            arg-name="${this.name}"
                            value="${this.value}"
                            ${this.disabled ? "disabled" : ""}>
@@ -104,6 +109,7 @@ class HTMLIngredient {
                    <input type="number"
                        class="form-control arg inline"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        value="${this.value}"
                        min="${this.min}"
@@ -120,6 +126,7 @@ class HTMLIngredient {
                            <input type="checkbox"
                                class="arg"
                                id="${this.id}"
+                                tabindex="${this.tabIndex}"
                                arg-name="${this.name}"
                                ${this.value ? " checked" : ""}
                                ${this.disabled ? " disabled" : ""}
@@ -135,6 +142,7 @@ class HTMLIngredient {
                    <select
                        class="form-control arg inline"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        ${this.disabled ? "disabled" : ""}>`;
                for (i = 0; i < this.value.length; i++) {
@@ -157,6 +165,7 @@ class HTMLIngredient {
                    <select
                        class="form-control arg no-state-change populate-option"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        ${this.disabled ? "disabled" : ""}>`;
                for (i = 0; i < this.value.length; i++) {
@@ -186,6 +195,7 @@ class HTMLIngredient {
                    <input type="text"
                        class="form-control arg"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        value="${this.value[this.defaultIndex].value}"
                        ${this.disabled ? "disabled" : ""}>
@@ -215,6 +225,7 @@ class HTMLIngredient {
                    <input type="text"
                        class="form-control arg inline"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        value="${this.value[this.defaultIndex].value}"
                        ${this.disabled ? "disabled" : ""}>
@@ -244,6 +255,7 @@ class HTMLIngredient {
                    <textarea
                        class="form-control arg"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        rows="${this.rows ? this.rows : 3}"
                        ${this.disabled ? "disabled" : ""}>${this.value}</textarea>
@@ -256,6 +268,7 @@ class HTMLIngredient {
                    <select
                        class="form-control arg inline arg-selector"
                        id="${this.id}"
+                        tabindex="${this.tabIndex}"
                        arg-name="${this.name}"
                        ${this.disabled ? "disabled" : ""}>`;
                for (i = 0; i < this.value.length; i++) {
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -168,7 +168,7 @@
            <div id="workspace-wrapper">
                <div id="operations" class="split split-horizontal no-select">
                    <div class="title no-select">Operations</div>
-                    <input id="search" type="search" class="form-control" placeholder="Search..." autocomplete="off">
+                    <input id="search" type="search" class="form-control" placeholder="Search..." autocomplete="off" tabindex="2">
                    <ul id="search-results" class="op-list"></ul>
                    <div id="categories" class="panel-group no-select"></div>
                </div>
@@ -266,7 +266,7 @@
                        </div>
                        <div class="textarea-wrapper no-select input-wrapper" id="input-wrapper">
                            <div id="input-highlighter" class="no-select"></div>
-                            <textarea id="input-text" class="input-text" spellcheck="false"></textarea>
+                            <textarea id="input-text" class="input-text" spellcheck="false" tabindex="1" autofocus></textarea>
                            <div class="input-file" id="input-file">
                                <div class="file-overlay" id="file-overlay"></div>
                                <div style="position: relative; height: 100%;">
--- a/src/web/static/clippy_assets/agents/Clippy/agent.js
+++ b/src/web/static/clippy_assets/agents/Clippy/agent.js
--- a/src/web/static/clippy_assets/agents/Clippy/map.png
+++ b/src/web/static/clippy_assets/agents/Clippy/map.png
--- a/src/web/static/clippy_assets/clippy.css
+++ b/src/web/static/clippy_assets/clippy.css
@@ -1,62 +0,0 @@
-.clippy, .clippy-balloon {
-    position: fixed;
-    z-index: 1000;
-    cursor: pointer;
-}
-
-.clippy-balloon {
-
-    background: #FFC;
-    color: black;
-    padding: 8px;
-    border: 1px solid black;
-    border-radius: 5px;
-
-}
-
-.clippy-content {
-    max-width: 200px;
-    min-width: 120px;
-    font-family: "Microsoft Sans", sans-serif;
-    font-size: 10pt;
-}
-
-.clippy-tip {
-    width: 10px;
-    height: 16px;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAgCAMAAAAlvKiEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAlQTFRF///MAAAA////52QwgAAAAAN0Uk5T//8A18oNQQAAAGxJREFUeNqs0kEOwCAIRFHn3//QTUU6xMyyxii+jQosrTPkyPEM6IN3FtzIRk1U4dFeKWQiH6pRRowMVKEmvronEynkwj0uZJgR22+YLopPSo9P34wJSamLSU7lSIWLJU7NkNomNlhqxUeAAQC+TQLZyEuJBwAAAABJRU5ErkJggg==) no-repeat;
-    position: absolute;
-}
-
-.clippy-top-left .clippy-tip {
-    top: 100%;
-    margin-top: 0px;
-    left: 100%;
-    margin-left: -50px;
-}
-
-.clippy-top-right .clippy-tip {
-    top: 100%;
-    margin-top: 0px;
-    left: 0;
-    margin-left: 50px;
-    background-position: -10px 0;
-
-}
-
-.clippy-bottom-right .clippy-tip {
-    top: 0;
-    margin-top: -16px;
-    left: 0;
-    margin-left: 50px;
-    background-position: -10px -16px;
-}
-
-.clippy-bottom-left .clippy-tip {
-    top: 0;
-    margin-top: -16px;
-    left: 100%;
-    margin-left: -50px;
-    background-position: 0px -16px;
-}
-
--- a/src/web/static/clippy_assets/images/border.png
+++ b/src/web/static/clippy_assets/images/border.png
--- a/src/web/static/clippy_assets/images/tip.png
+++ b/src/web/static/clippy_assets/images/tip.png
--- a/src/web/stylesheets/index.js
+++ b/src/web/stylesheets/index.js
@@ -8,7 +8,6 @@

 /* Libraries */
 import "highlight.js/styles/vs.css";
-import "../static/clippy_assets/clippy.css";

 /* Frameworks */
 import "./vendors/bootstrap.scss";
--- a/src/web/stylesheets/utils/_overrides.css
+++ b/src/web/stylesheets/utils/_overrides.css
@@ -82,14 +82,6 @@ a:focus {
    border-color: var(--btn-success-hover-border-colour);
 }

-input[type="search"] {
-    appearance: searchfield;
-}
-
-input[type="search"]::-webkit-search-cancel-button {
-    appearance: searchfield-cancel-button;
-}
-
 select.form-control:not([size]):not([multiple]), select.custom-file-control:not([size]):not([multiple]) {
    height: unset !important;
 }
--- a/src/web/waiters/ControlsWaiter.mjs
+++ b/src/web/waiters/ControlsWaiter.mjs
@@ -25,7 +25,7 @@ class ControlsWaiter {


    /**
-     * Initialise Bootstrap componenets
+     * Initialise Bootstrap components
     */
    initComponents() {
        $("body").bootstrapMaterialDesign();
--- a/src/web/waiters/OperationsWaiter.mjs
+++ b/src/web/waiters/OperationsWaiter.mjs
@@ -172,7 +172,7 @@ class OperationsWaiter {
        $(el).find("[data-toggle=popover]").addBack("[data-toggle=popover]")
            .popover({trigger: "manual"})
            .on("mouseenter", function(e) {
-                if (e.buttons > 0) return; // Mouse button held down - likely dragging an opertion
+                if (e.buttons > 0) return; // Mouse button held down - likely dragging an operation
                const _this = this;
                $(this).popover("show");
                $(".popover").on("mouseleave", function () {
--- a/src/web/waiters/OptionsWaiter.mjs
+++ b/src/web/waiters/OptionsWaiter.mjs
@@ -58,7 +58,7 @@ class OptionsWaiter {

    /**
     * Handler for options click events.
-     * Dispays the options pane.
+     * Displays the options pane.
     *
     * @param {event} e
     */
@@ -153,14 +153,28 @@ class OptionsWaiter {


    /**
-     * Changes the theme by setting the class of the <html> element.
+     * Theme change event listener
     *
     * @param {Event} e
     */
    themeChange(e) {
        const themeClass = e.target.value;

-        document.querySelector(":root").className = themeClass;
+        this.changeTheme(themeClass);
+    }
+
+
+    /**
+     * Changes the theme by setting the class of the <html> element.
+     *
+     * @param (string} theme
+     */
+    changeTheme(theme) {
+        document.querySelector(":root").className = theme;
+
+        // Update theme selection
+        const themeSelect = document.getElementById("theme");
+        themeSelect.selectedIndex = themeSelect.querySelector(`option[value="${theme}"`).index;
    }


--- a/src/web/waiters/OutputWaiter.mjs
+++ b/src/web/waiters/OutputWaiter.mjs
@@ -174,7 +174,7 @@ class OutputWaiter {
    }

    /**
-     * Updates the stored bake ID for the output in the ouptut array
+     * Updates the stored bake ID for the output in the output array
     *
     * @param {number} bakeId
     * @param {number} inputNum
@@ -1046,15 +1046,25 @@ class OutputWaiter {
     * @param {Object[]} options
     */
    backgroundMagicResult(options) {
-        if (!options.length ||
-            !options[0].recipe.length)
-            return;
+        if (!options.length) return;

        const currentRecipeConfig = this.app.getRecipeConfig();
-        const newRecipeConfig = currentRecipeConfig.concat(options[0].recipe);
-        const opSequence = options[0].recipe.map(o => o.op).join(", ");
+        let msg = "",
+            newRecipeConfig;

-        this.showMagicButton(opSequence, options[0].data, newRecipeConfig);
+        if (options[0].recipe.length) {
+            const opSequence = options[0].recipe.map(o => o.op).join(", ");
+            newRecipeConfig = currentRecipeConfig.concat(options[0].recipe);
+            msg = `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.escapeHtml(Utils.truncate(options[0].data), 30)}"</span>`;
+        } else if (options[0].fileType && options[0].fileType.name) {
+            const ft = options[0].fileType;
+            newRecipeConfig = currentRecipeConfig.concat([{op: "Detect File Type", args: []}]);
+            msg = `<i>${ft.name}</i> file detected`;
+        } else {
+            return;
+        }
+
+        this.showMagicButton(msg, newRecipeConfig);
    }

    /**
@@ -1072,15 +1082,14 @@ class OutputWaiter {
    }

    /**
-     * Displays the Magic button with a title and adds a link to a complete recipe.
+     * Displays the Magic button with a title and adds a link to a recipe.
     *
-     * @param {string} opSequence
-     * @param {string} result
+     * @param {string} msg
     * @param {Object[]} recipeConfig
     */
-    showMagicButton(opSequence, result, recipeConfig) {
+    showMagicButton(msg, recipeConfig) {
        const magicButton = document.getElementById("magic");
-        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.escapeHtml(Utils.truncate(result), 30)}"</span>`);
+        magicButton.setAttribute("data-original-title", msg);
        magicButton.setAttribute("data-recipe", JSON.stringify(recipeConfig), null, "");
        magicButton.classList.remove("hidden");
        magicButton.classList.add("pulse");
--- a/src/web/waiters/SeasonalWaiter.mjs
+++ b/src/web/waiters/SeasonalWaiter.mjs
@@ -4,17 +4,13 @@
 * @license Apache-2.0
 */

-import clippy from "clippyjs";
-import "../static/clippy_assets/agents/Clippy/agent.js";
-import clippyMap from "../static/clippy_assets/agents/Clippy/map.png";
-
 /**
 * Waiter to handle seasonal events and easter eggs.
 */
 class SeasonalWaiter {

    /**
-     * SeasonalWaiter contructor.
+     * SeasonalWaiter constructor.
     *
     * @param {App} app - The main view object for CyberChef.
     * @param {Manager} manager - The CyberChef event manager.
@@ -22,8 +18,6 @@ class SeasonalWaiter {
    constructor(app, manager) {
        this.app = app;
        this.manager = manager;
-
-        this.clippyAgent = null;
    }


@@ -34,14 +28,6 @@ class SeasonalWaiter {
        // Konami code
        this.kkeys = [];
        window.addEventListener("keydown", this.konamiCodeListener.bind(this));
-
-        // Clippy
-        const now = new Date();
-        if (now.getMonth() === 3 && now.getDate() === 1) {
-            this.addClippyOption();
-            this.manager.addDynamicListener(".option-item #clippy", "change", this.setupClippy, this);
-            this.setupClippy();
-        }
    }


@@ -65,285 +51,6 @@ class SeasonalWaiter {
        }
    }

-    /**
-     * Creates an option in the Options menu for turning Clippy on or off
-     */
-    addClippyOption() {
-        const optionsBody = document.getElementById("options-body"),
-            optionItem = document.createElement("span");
-
-        optionItem.className = "bmd-form-group is-filled";
-        optionItem.innerHTML = `<div class="checkbox option-item">
-            <label for="clippy">
-                <input type="checkbox" option="clippy" id="clippy" checked="">
-                Use the Clippy helper
-            </label>
-        </div>`;
-        optionsBody.appendChild(optionItem);
-
-        if (!("clippy" in this.app.options)) {
-            this.app.options.clippy = true;
-        }
-
-        this.manager.options.load();
-    }
-
-    /**
-     * Sets up Clippy for April Fools Day
-     */
-    setupClippy() {
-        // Destroy any previous agents
-        if (this.clippyAgent) {
-            this.clippyAgent.closeBalloonImmediately();
-            this.clippyAgent.hide();
-        }
-
-        if (!this.app.options.clippy) {
-            if (this.clippyTimeouts) this.clippyTimeouts.forEach(t => clearTimeout(t));
-            return;
-        }
-
-        // Set base path to # to prevent external network requests
-        const clippyAssets = "#";
-        // Shim the library to prevent external network requests
-        shimClippy(clippy);
-
-        const self = this;
-        clippy.load("Clippy", (agent) => {
-            shimClippyAgent(agent);
-            self.clippyAgent = agent;
-            agent.show();
-            agent.speak("Hello, I'm Clippy, your personal cyber assistant!");
-        }, undefined, clippyAssets);
-
-        // Watch for the Auto Magic button appearing
-        const magic = document.getElementById("magic");
-        const observer = new MutationObserver((mutationsList, observer) => {
-            // Read in message and recipe
-            let msg, recipe;
-            for (const mutation of mutationsList) {
-                if (mutation.attributeName === "data-original-title") {
-                    msg = magic.getAttribute("data-original-title");
-                }
-                if (mutation.attributeName === "data-recipe") {
-                    recipe = magic.getAttribute("data-recipe");
-                }
-            }
-
-            // Close balloon if it is currently showing a magic hint
-            const balloon = self.clippyAgent._balloon._balloon;
-            if (balloon.is(":visible") && balloon.text().indexOf("That looks like encoded data") >= 0) {
-                self.clippyAgent._balloon.hide(true);
-                this.clippyAgent._balloon._hidden = true;
-            }
-
-            // If a recipe was found, get Clippy to tell the user
-            if (recipe) {
-                recipe = this.manager.controls.generateStateUrl(true, true, JSON.parse(recipe));
-                msg = `That looks like encoded data!<br><br>${msg}<br><br>Click <a class="clippyMagicRecipe" href="${recipe}">here</a> to load this recipe.`;
-
-                // Stop current balloon activity immediately and trigger speak again
-                this.clippyAgent.closeBalloonImmediately();
-                self.clippyAgent.speak(msg, true);
-                // self.clippyAgent._queue.next();
-            }
-        });
-        observer.observe(document.getElementById("magic"), {attributes: true});
-
-        // Play animations for various things
-        this.manager.addListeners("#search", "click", () => {
-            this.clippyAgent.play("Searching");
-        }, this);
-        this.manager.addListeners("#save,#save-to-file", "click", () => {
-            this.clippyAgent.play("Save");
-        }, this);
-        this.manager.addListeners("#clr-recipe,#clr-io", "click", () => {
-            this.clippyAgent.play("EmptyTrash");
-        }, this);
-        this.manager.addListeners("#bake", "click", e => {
-            if (e.target.closest("button").textContent.toLowerCase().indexOf("bake") >= 0) {
-                this.clippyAgent.play("Thinking");
-            } else {
-                this.clippyAgent.play("EmptyTrash");
-            }
-            this.clippyAgent._queue.clear();
-        }, this);
-        this.manager.addListeners("#input-text", "keydown", () => {
-            this.clippyAgent.play("Writing");
-            this.clippyAgent._queue.clear();
-        }, this);
-        this.manager.addDynamicListener("a.clippyMagicRecipe", "click", (e) => {
-            this.clippyAgent.play("Congratulate");
-        }, this);
-
-        this.clippyTimeouts = [];
-        // Show challenge after timeout
-        this.clippyTimeouts.push(setTimeout(() => {
-            const hex = "1f 8b 08 00 ae a1 9b 5c 00 ff 05 40 a1 12 00 10 0c fd 26 61 5b 76 aa 9d 26 a8 02 02 37 84 f7 fb bb c5 a4 5f 22 c6 09 e5 6e c5 4c 2d 3f e9 30 a6 ea 41 a2 f2 ac 1c 00 00 00";
-            self.clippyAgent.speak(`How about a fun challenge?<br><br>Try decoding this (click to load):<br><a href="#recipe=[]&input=${encodeURIComponent(btoa(hex))}">${hex}</a>`, true);
-            self.clippyAgent.play("GetAttention");
-        }, 1 * 60 * 1000));
-
-        this.clippyTimeouts.push(setTimeout(() => {
-            self.clippyAgent.speak("<i>Did you know?</i><br><br>You can load files into CyberChef up to around 500MB using drag and drop or the load file button.", 15000);
-            self.clippyAgent.play("Wave");
-        }, 2 * 60 * 1000));
-
-        this.clippyTimeouts.push(setTimeout(() => {
-            self.clippyAgent.speak("<i>Did you know?</i><br><br>You can use the 'Fork' operation to split up your input and run the recipe over each branch separately.<br><br><a class='clippyMagicRecipe' href=\"#recipe=Fork('%5C%5Cn','%5C%5Cn',false)From_UNIX_Timestamp('Seconds%20(s)')&amp;input=OTc4MzQ2ODAwCjEwMTI2NTEyMDAKMTA0NjY5NjQwMAoxMDgxMDg3MjAwCjExMTUzMDUyMDAKMTE0OTYwOTYwMA\">Here's an example</a>.", 15000);
-            self.clippyAgent.play("Print");
-        }, 3 * 60 * 1000));
-
-        this.clippyTimeouts.push(setTimeout(() => {
-            self.clippyAgent.speak("<i>Did you know?</i><br><br>The 'Magic' operation uses a number of methods to detect encoded data and the operations which can be used to make sense of it. A technical description of these methods can be found <a href=\"https://github.com/gchq/CyberChef/wiki/Automatic-detection-of-encoded-data-using-CyberChef-Magic\">here</a>.", 15000);
-            self.clippyAgent.play("Alert");
-        }, 4 * 60 * 1000));
-
-        this.clippyTimeouts.push(setTimeout(() => {
-            self.clippyAgent.speak("<i>Did you know?</i><br><br>You can use parts of the input as arguments to operations.<br><br><a class='clippyMagicRecipe' href=\"#recipe=Register('key%3D(%5B%5C%5Cda-f%5D*)',true,false)Find_/_Replace(%7B'option':'Regex','string':'.*data%3D(.*)'%7D,'$1',true,false,true)RC4(%7B'option':'Hex','string':'$R0'%7D,'Hex','Latin1')&amp;input=aHR0cDovL21hbHdhcmV6LmJpei9iZWFjb24ucGhwP2tleT0wZTkzMmE1YyZkYXRhPThkYjdkNWViZTM4NjYzYTU0ZWNiYjMzNGUzZGIxMQ\">Click here for an example</a>.", 15000);
-            self.clippyAgent.play("CheckingSomething");
-        }, 5 * 60 * 1000));
-    }
-
-}
-
-
-/**
- * Shims various ClippyJS functions to modify behaviour.
- *
- * @param {Clippy} clippy - The Clippy library
- */
-function shimClippy(clippy) {
-    // Shim _loadSounds so that it doesn't actually try to load any sounds
-    clippy.load._loadSounds = function _loadSounds (name, path) {
-        let dfd = clippy.load._sounds[name];
-        if (dfd) return dfd;
-
-        // set dfd if not defined
-        dfd = clippy.load._sounds[name] = $.Deferred();
-
-        // Resolve immediately without loading
-        dfd.resolve({});
-
-        return dfd.promise();
-    };
-
-    // Shim _loadMap so that it uses the local copy
-    clippy.load._loadMap = function _loadMap (path) {
-        let dfd = clippy.load._maps[path];
-        if (dfd) return dfd;
-
-        // set dfd if not defined
-        dfd = clippy.load._maps[path] = $.Deferred();
-
-        const src = clippyMap;
-        const img = new Image();
-
-        img.onload = dfd.resolve;
-        img.onerror = dfd.reject;
-
-        // start loading the map;
-        img.setAttribute("src", src);
-
-        return dfd.promise();
-    };
-
-    // Make sure we don't request the remote map
-    clippy.Animator.prototype._setupElement = function _setupElement (el) {
-        const frameSize = this._data.framesize;
-        el.css("display", "none");
-        el.css({ width: frameSize[0], height: frameSize[1] });
-        el.css("background", "url('" + clippyMap + "') no-repeat");
-
-        return el;
-    };
-}
-
-/**
- * Shims various ClippyJS Agent functions to modify behaviour.
- *
- * @param {Agent} agent - The Clippy Agent
- */
-function shimClippyAgent(agent) {
-    // Turn off all sounds
-    agent._animator._playSound = () => {};
-
-    // Improve speak function to support HTML markup
-    const self = agent._balloon;
-    agent._balloon.speak = (complete, text, hold) => {
-        self._hidden = false;
-        self.show();
-        const c = self._content;
-        // set height to auto
-        c.height("auto");
-        c.width("auto");
-        // add the text
-        c.html(text);
-        // set height
-        c.height(c.height());
-        c.width(c.width());
-        c.text("");
-        self.reposition();
-
-        self._complete = complete;
-        self._sayWords(text, hold, complete);
-        if (hold) agent._queue.next();
-    };
-
-    // Improve the _sayWords function to allow HTML and support timeouts
-    agent._balloon.WORD_SPEAK_TIME = 60;
-    agent._balloon._sayWords = (text, hold, complete) => {
-        self._active = true;
-        self._hold = hold;
-        const words = text.split(/[^\S-]/);
-        const time = self.WORD_SPEAK_TIME;
-        const el = self._content;
-        let idx = 1;
-        clearTimeout(self.holdTimeout);
-
-        self._addWord = $.proxy(function () {
-            if (!self._active) return;
-            if (idx > words.length) {
-                delete self._addWord;
-                self._active = false;
-                if (!self._hold) {
-                    complete();
-                    self.hide();
-                } else if (typeof hold === "number") {
-                    self.holdTimeout = setTimeout(() => {
-                        self._hold = false;
-                        complete();
-                        self.hide();
-                    }, hold);
-                }
-            } else {
-                el.html(words.slice(0, idx).join(" "));
-                idx++;
-                self._loop = window.setTimeout($.proxy(self._addWord, self), time);
-            }
-        }, self);
-
-        self._addWord();
-    };
-
-    // Add break-word to balloon CSS
-    agent._balloon._balloon.css("word-break", "break-word");
-
-    // Close the balloon on click (unless it was a link)
-    agent._balloon._balloon.click(e => {
-        if (e.target.nodeName !== "A") {
-            agent._balloon.hide(true);
-            agent._balloon._hidden = true;
-        }
-    });
-
-    // Add function to immediately close the balloon even if it is currently doing something
-    agent.closeBalloonImmediately = () => {
-        agent._queue.clear();
-        agent._balloon.hide(true);
-        agent._balloon._hidden = true;
-        agent._queue.next();
-    };
 }

 export default SeasonalWaiter;
--- a/src/web/waiters/WindowWaiter.mjs
+++ b/src/web/waiters/WindowWaiter.mjs
@@ -33,7 +33,7 @@ class WindowWaiter {

    /**
     * Handler for window blur events.
-     * Saves the current time so that we can calculate how long the window was unfocussed for when
+     * Saves the current time so that we can calculate how long the window was unfocused for when
     * focus is returned.
     */
    windowBlur() {
--- a/src/web/waiters/WorkerWaiter.mjs
+++ b/src/web/waiters/WorkerWaiter.mjs
@@ -353,7 +353,7 @@ class WorkerWaiter {
     * @param {object} workerObj - Object containing the worker information
     * @param {ChefWorker} workerObj.worker - The actual worker object
     * @param {number} workerObj.inputNum - The inputNum of the input being baked by the worker
-     * @param {boolean} workerObj.active - If true, the worker is currrently baking an input
+     * @param {boolean} workerObj.active - If true, the worker is currently baking an input
     */
    workerFinished(workerObj) {
        const workerIdx = this.chefWorkers.indexOf(workerObj);
--- a/src/web/workers/InputWorker.mjs
+++ b/src/web/workers/InputWorker.mjs
@@ -945,7 +945,7 @@ self.updateMaxTabs = function(maxTabs, activeTab) {
 * @param {boolean} searchData.showLoading - If true, include loading inputs in the results
 * @param {boolean} searchData.showLoaded - If true, include loaded inputs in the results
 * @param {string} searchData.filter - A regular expression to match the inputs on
- * @param {string} searchData.filterType - Either "CONTENT" or "FILENAME". Detemines what should be matched with filter
+ * @param {string} searchData.filterType - Either "CONTENT" or "FILENAME". Determines what should be matched with filter
 * @param {number} searchData.numResults - The maximum number of results to be returned
 */
 self.filterTabs = function(searchData) {
--- a/tests/lib/TestRegister.mjs
+++ b/tests/lib/TestRegister.mjs
@@ -104,8 +104,6 @@ class TestRegister {
     * Run all api related tests and wrap results in report format
     */
    runApiTests() {
-        console.log("Running tests...");
-
        return Promise.all(this.apiTests.map(async function(test, i) {
            const result = {
                test: test,
--- a/tests/node/assertionHandler.mjs
+++ b/tests/node/assertionHandler.mjs
@@ -15,9 +15,9 @@
 /**
 * Print useful stack on error
 */
-const wrapRun = (run) => () => {
+const wrapRun = (run) => async () => {
    try {
-        run();
+        await run();
    } catch (e) {
        console.dir(e);
        throw e;
--- a/tests/node/index.mjs
+++ b/tests/node/index.mjs
@@ -13,13 +13,16 @@
 import {
    setLongTestFailure,
    logTestReport,
-} from "../lib/utils";
+} from "../lib/utils.mjs";

 import TestRegister from "../lib/TestRegister.mjs";
-import "./tests/nodeApi";
-import "./tests/operations";
-import "./tests/File";
-import "./tests/NodeDish";
+import "./tests/nodeApi.mjs";
+import "./tests/operations.mjs";
+import "./tests/File.mjs";
+import "./tests/Dish.mjs";
+import "./tests/NodeDish.mjs";
+import "./tests/Utils.mjs";
+import "./tests/Categories.mjs";

 const testStatus = {
    allTestsPassing: true,
--- a/tests/node/tests/Categories.mjs
+++ b/tests/node/tests/Categories.mjs
@@ -0,0 +1,19 @@
+import TestRegister from "../../lib/TestRegister.mjs";
+import Categories from "../../../src/core/config/Categories.json";
+import OperationConfig from "../../../src/core/config/OperationConfig.json";
+import it from "../assertionHandler.mjs";
+import assert from "assert";
+
+TestRegister.addApiTests([
+    it("Categories: operations should be in a category", () => {
+        const catOps = [];
+        Categories.forEach(cat => {
+            catOps.push(...cat.ops);
+        });
+
+        for (const op in OperationConfig) {
+            assert(catOps.includes(op), `'${op}' operation is not present in any category`);
+        }
+    }),
+
+]);
--- a/tests/node/tests/Dish.mjs
+++ b/tests/node/tests/Dish.mjs
@@ -1,6 +1,6 @@
 import TestRegister from "../../lib/TestRegister.mjs";
-import Dish from "../../src/core/Dish.mjs";
-import it from "../node/assertionHandler.mjs";
+import Dish from "../../../src/core/Dish.mjs";
+import it from "../../node/assertionHandler.mjs";
 import assert from "assert";

 TestRegister.addApiTests([
--- a/tests/node/tests/Utils.mjs
+++ b/tests/node/tests/Utils.mjs
@@ -0,0 +1,23 @@
+import TestRegister from "../../lib/TestRegister.mjs";
+import Utils from "../../../src/core/Utils.mjs";
+import it from "../assertionHandler.mjs";
+import assert from "assert";
+
+TestRegister.addApiTests([
+    it("Utils: should parse six backslashes correctly", () => {
+        assert.equal(Utils.parseEscapedChars("\\\\\\\\\\\\"), "\\\\\\");
+    }),
+
+    it("Utils: should parse escaped quotes correctly", () => {
+        assert.equal(Utils.parseEscapedChars("\\'"), "'");
+    }),
+
+    it("Utils: should parse escaped quotes and backslashes correctly", () => {
+        assert.equal(Utils.parseEscapedChars("\\\\'"), "\\'");
+    }),
+
+    it("Utils: should parse escaped quotes and escaped backslashes correctly", () => {
+        assert.equal(Utils.parseEscapedChars("\\\\\\'"), "\\'");
+    }),
+
+]);
--- a/tests/node/tests/operations.mjs
+++ b/tests/node/tests/operations.mjs
@@ -31,7 +31,7 @@ import {
    cartesianProduct,
    CSSMinify,
    toBase64,
-    toHex,
+    toHex
 } from "../../../src/node/index";
 import chef from "../../../src/node/index.mjs";
 import TestRegister from "../../lib/TestRegister.mjs";
@@ -130,11 +130,14 @@ Tiger-128`;
    it("atBash Cipher", () => {
        const result = chef.atbashCipher("Happy as a Clam");
        assert.strictEqual(result.toString(), "Szkkb zh z Xozn");
+
    }),

    it("Bcrypt", async () => {
        const result = await chef.bcrypt("Put a Sock In It");
-        assert.strictEqual(result.toString(), "$2a$10$ODeP1.6fMsb.ENk2ngPUCO7qTGVPyHA9TqDVcyupyed8FjsiF65L6");
+        const strResult = result.toString();
+        assert.equal(strResult.length, 60);
+        assert.equal(strResult.slice(0, 7), "$2a$10$");
    }),

    it("bcryptCompare", async() => {
@@ -397,7 +400,7 @@ color: white;
            },
            iv: {
                string: "threetwo",
-                option: "Hex",
+                option: "utf8",
            },
            mode: "ECB",
        });
@@ -412,7 +415,7 @@ color: white;
            },
            iv: {
                string: "threetwo",
-                option: "Hex",
+                option: "utf8",
            },
            mode: "ECB",
        });
@@ -583,47 +586,7 @@ Password: 034148`;
        const result = await chef.generatePGPKeyPair("Back To the Drawing Board", {
            keyType: "ECC-256",
        });
-        const expected = `-----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: Keybase OpenPGP v2.0.77
-Comment: https://keybase.io/crypto
-
-xYgEW3KciQEBAK96Lx9G0WZiw1yhC35IogdumoxEJXsLdAVIjmskXeAfABEBAAEA
-AP4wK+OZu3AqojwtRoyIK1pHKU93OAuam1iaLCOGCwCckQCA5PjU0aLNZqy/eKyX
-T3rpKQCAxDDT5hHGAUfFPUu73KWABwB/WKpeUp7KwurMSbYVhgr1TijszQDCVAQT
-AQoAHgUCW3KciQIbLwMLCQcDFQoIAh4BAheAAxYCAQIZAQAKCRD0VeyUMgmpz3OE
-AP9qsnhhoK85Tnu6VKwKm1iMiJAssDQnFztDaMmmVdrN/MeIBFtynIkBAQDDhjIw
-fxOprqVMYLk6aC45JyPAA2POzu0Zb/rx0tKeBwARAQABAAD/XAr66oiP9ZORHiT0
-XZH4m7vwZt7AHuq4pYtVlMQXk60AgPw2Mno/wStvE/SBa9R7AtsAgMZ2BkJjvNPZ
-9YA6cl4lW0UAgI1+kJVLZ5VR9fPENfJR80EtncKDBBgBCgAPBQJbcpyJBQkPCZwA
-AhsuAEgJEPRV7JQyCanPPSAEGQEKAAYFAltynIkACgkQrewgWMQZ/b2blwD/dbwh
-/3F9xv+YGAwq8i1mzzswg4qBct6LoSIjGglULT9RIQD/cYd31YfKrEnbSBWD5PLi
-zcSsxtBGKphwXiPAlQJ1Q5DHiARbcpyJAQEAs8V418lf1T74PpAwdBTiViEUX9jB
-e+ZrAEVaq5nu1C8AEQEAAQAA/iPWhS23hnRTllealR4/H5OofZRwxvIQrxAJp6z1
-ICRxAIDayRpCAbK5EC3DzRU2z4VpAIDSWYSs9inI1VTfamJPMWHXAIC3aaukzCP4
-GEGeFobX/thnKhnCgwQYAQoADwUCW3KciQUJA8JnAAIbLgBICRD0VeyUMgmpzz0g
-BBkBCgAGBQJbcpyJAAoJEB4jzL1hmQIXamUA/0c1M6BSqVtxNowPcOAXKYIxMca1
-VFcRWolHnZqdZQ7k/J8A/3HvNLRS3p1HvjQEfXl/qKoRRn843Py09ptDHh+xpGKh
-=d+Vp
-----END PGP PRIVATE KEY BLOCK-----
-
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: Keybase OpenPGP v2.0.77
-Comment: https://keybase.io/crypto
-
-xi0EW3KciQEBAK96Lx9G0WZiw1yhC35IogdumoxEJXsLdAVIjmskXeAfABEBAAHN
-AMJUBBMBCgAeBQJbcpyJAhsvAwsJBwMVCggCHgECF4ADFgIBAhkBAAoJEPRV7JQy
-CanPc4QA/2qyeGGgrzlOe7pUrAqbWIyIkCywNCcXO0NoyaZV2s38zi0EW3KciQEB
-AMOGMjB/E6mupUxguTpoLjknI8ADY87O7Rlv+vHS0p4HABEBAAHCgwQYAQoADwUC
-W3KciQUJDwmcAAIbLgBICRD0VeyUMgmpzz0gBBkBCgAGBQJbcpyJAAoJEK3sIFjE
-Gf29m5cA/3W8If9xfcb/mBgMKvItZs87MIOKgXLei6EiIxoJVC0/USEA/3GHd9WH
-yqxJ20gVg+Ty4s3ErMbQRiqYcF4jwJUCdUOQzi0EW3KciQEBALPFeNfJX9U++D6Q
-MHQU4lYhFF/YwXvmawBFWquZ7tQvABEBAAHCgwQYAQoADwUCW3KciQUJA8JnAAIb
-LgBICRD0VeyUMgmpzz0gBBkBCgAGBQJbcpyJAAoJEB4jzL1hmQIXamUA/0c1M6BS
-qVtxNowPcOAXKYIxMca1VFcRWolHnZqdZQ7k/J8A/3HvNLRS3p1HvjQEfXl/qKoR
-Rn843Py09ptDHh+xpGKh
-=ySwG
-----END PGP PUBLIC KEY BLOCK-----`;
-        assert.strictEqual(result.toString(), expected);
+        assert.strictEqual(result.toString().length, 2005);
    }),

    it("Generate UUID", () => {
@@ -737,43 +700,105 @@ CPU
        assert.strictEqual(result.toString(), expected);
    }),

-    it("PGP Encrypt", async () => {
+    it("PGP Encrypt and decrypt", async () => {
        const pbkey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mI0EVWOihAEEALzwFAVWTrD0KiWCH5tX6q6QsGjlRn4IP2uj/xWsJZDNbCKm+JAe
-1RvIootpW1+PNNMJlIInwUgtCjtJ9gZbGBpXeqwdSn0oYuj9X86ekXOUnZsRoPCj
-RwS8kpbrvRVfhWN8hYuXFcXK2J2Ld0ZpVyJzkncpFdpAgzTPMfrO1HS5ABEBAAG0
-GmdwZyBuYW1lIChjb21tZW50KSA8ZW1AaWw+iLgEEwECACIFAlVjooQCGwMGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEBg8dTRwi4g5I40D/2+uUuQxa3uMrAeI
-dXLaJWz3V0cl1rotfBP47apDUGbkm1HVgULJUo8Bo15Ii83ST8TUsyja3XcLutHb
-IwYSWo41gEV48+NKoN6Oy3HwqBoHfH06bu0If75vdSjnZpB2dO/Ph7L9kz78gc4y
-tZx4bE64MTlL2AYghZxyYpFyydjXuI0EVWOihAEEANE4UU+4iB2hMAXq93hiBzIh
-AMtn/DlWbJkpdUgrjKOG6tILs28mrw9rI4PivmT7grkyNW8sa3ATsmWC1xChxGTN
-T1guyh0Hhbc3Otfng2BFSWcBkPwUoNaOdrVFpP9J51IYrsQHsjbZlY45ghDBzM6t
-sISfkmmFCsp0l7w/XAcvABEBAAGInwQYAQIACQUCVWOihAIbDAAKCRAYPHU0cIuI
-OQ2BA/9KWqOhXZW75ac7CuJMfileZR7vRy9CkKyNG21cZtAlqftAX+m8FGdG0duU
-jKHiPvjXhSfP3lmrQ7brja9LgSzkiBqQzvPW55G67nGQdUC+mqZNJNlRh+8atf9I
-5nxg2i8zn6F5cLaNWz7cl27m1/mXKcH3gult1PLR4PiYLiC9aw==
-=xw3e
-----END PGP PUBLIC KEY BLOCK-----`;
-
-        const result = await chef.PGPEncrypt("A Fool and His Money are Soon Parted", {
-            publicKeyOfRecipient: pbkey,
-        });
-        const expected = `-----BEGIN PGP MESSAGE-----
-Version: Keybase OpenPGP v2.0.77
+Version: Keybase OpenPGP v2.1.3
 Comment: https://keybase.io/crypto

-wYwDv1kIXPPNwmABA/4syW+oO+S/mfpjdp83/MZJiKh6XNQoPr/N5/1Is/QXYu9V
-/v8/b+eReOpUVC6cVrJ8U5cB19y1Az3NQWHXLEC0jND2wL3cUM4sv87hlvv2PLhc
-okv8OHNCitRiweo7NZHVygHGdFvY082G47e1PkyPAuVynvzdD450ta/s/KOxZdJg
-ARbZIrC6WmjYNLwhbpRYawKD+3N4I5qliRpU2POKRi9UROAW9dth6egy60TTCvyO
-jmPGsv1elXxVzqs58UZLD2c3vBhGkU2BV6kRKh+lj/EcVrzsFhGCz/7DKxPoDHLS
-=IBYt
-----END PGP MESSAGE-----
-`;
-        assert.strictEqual(result.toString(), expected);
+xo0EXZtlowEEAKUqTFownTmqgXWu2KDrtyNYtFck7a16WM5QD95bFoAFFdnlwZ45
+6Vw8G8LCzHdyRXYp/JF1GknDrAd7nIRE+SuSz2yVK5nlOCfO1HFcg2Ov7e7/pBwd
+qawx9GUIsCKd/6NxwDuT4YqarLFsuwljRC/eQiibO+ejnhoiKcU69sTNABEBAAHN
+AMK0BBMBCgAeBQJdm2WjAhsvAwsJBwMVCggCHgECF4ADFgIBAhkBAAoJEGS79V2S
+7D0owtMD/RT+o4BQJ8NSQBDgkYf42uOOu1Ud6GuN89nX6n20yAZbmqQ8CHnHY+Qc
+l6ft4HnbIaNrI3arp/C2C+cwFypmt1BKyFEJUXO7ft3i/IxnjpCorDyAMCDckDvq
+uma1LWtUHLb5s/ZuGMSHnhuji74IRWuIofNPdf7bCZW1GMbW9jNUzo0EXZtlowEE
+AL38zaNkPmUVQaowP696fayBo18Nxs0yOzC4+0TYv1B/k5aUb0Air2h+o/Xw4E42
+Jh9gVdPSvhOAEqdV0UDe71wxa4cfAVMDY9v8ta81MWunChj3ISUk1oIQylTJNsY/
+b4KWOrLaOtBD9dyFGCzss5vLVdqdMjVIW2Cz0hb6IYG7ABEBAAHCwIMEGAEKAA8F
+Al2bZaMFCQ8JnAACGy4AqAkQZLv1XZLsPSidIAQZAQoABgUCXZtlowAKCRA16MU2
+u2hFTX+JBACZ27xk0Afny2jjSoRzqLMrhzE7DBGcg2QqecMdNre12hVompAWcS4l
+NFmPShKRi6UT8Zb38nD43vwfqwZImn60dOPqqAep3YF/Axm1u5HJb0aMEsb8O9jV
+sVmNJv9jVTzPdlTGFQjuaeJfk5lwxB+5/O9NcgDhPgRAk9xb4FrT+xzmA/4tD11C
+AdcITUkTZT4ZOo2418DGeaiaEqWcIkZeQG4Vh5TMj4QtZDwsYQhXPl5Zj1zKIN/1
+gRrKC+ztaQoDG8pJXTTtc9inRU++dhMqnRGrPcz0VfVXFaiH7PUCy+4WpP6r5Bs5
+YQ9ESHo+FsmIvDzU3e/PD0SfXfO4vqBrFYN8986NBF2bZaMBBADJafe0w9diaCNx
+3A7e8MqjbNrhrLkD2cPxXspCATX3SuI19d2+hMiHZfKTyadBTIa+ICxvqoxwxyZD
+raHSY3CWVZd1V4KB5mqf+3Zj5riLeGU0dtXwi/5c0bdUhBUgHiAMhi75p05jYih5
+KsNxPcK9hEwPu7B+QeHURMiIgojTGQARAQABwsCDBBgBCgAPBQJdm2WjBQkDwmcA
+AhsuAKgJEGS79V2S7D0onSAEGQEKAAYFAl2bZaMACgkQzdkMJSM5Bqg2rwP/Ue28
+m3Fdfgh5JxouZ3Dm2KUDhZL95B+vdMk72acdoU7SRjlyDT8cApRqYx+MIXb8WrPN
+1xCZnOM4zXeWIM0CAPQ1e/sCrK58L+P+eVngNmrW9epKtZ4L6hx+dqqja9vPZGQK
+CsFAhA6A1gWB++OLk9Y6H23tWIdKEXMeAX7492zDYgP+OSPS79EWAqXL8SvmDrbl
+WI5eiM6X5hAMrOjQqzXhatD7eP41N/FC3SfhyhX7hFbagO7MJG2AS5bmSvcuCdcN
+wDwXd94B+7bfYgJIRKbr272yDwkyzGn+zmxzvMUt6ak5PNzfmadvhMZvIfDftswp
+GYpXIUU0GObOgP2tpCGTErs=
+=m++F
+-----END PGP PUBLIC KEY BLOCK-----`;
+        const privateKey = `-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: Keybase OpenPGP v2.1.3
+Comment: https://keybase.io/crypto
+
+xcEYBF2bZaMBBAClKkxaMJ05qoF1rtig67cjWLRXJO2teljOUA/eWxaABRXZ5cGe
+OelcPBvCwsx3ckV2KfyRdRpJw6wHe5yERPkrks9slSuZ5TgnztRxXINjr+3u/6Qc
+HamsMfRlCLAinf+jccA7k+GKmqyxbLsJY0Qv3kIomzvno54aIinFOvbEzQARAQAB
+AAP7BXVS5aN3/AkNqIvOiUQ7nqrr9s9NHYUOvJllFNucxZP6x2MyQAjjlJKV9kdF
+cOhxXDjXVHVIGPT4UUeoAgUHg6K0K5WLmmNaO1w7ayf9737OrhrQFblQNqh4J9BV
+oP/cArJ5+j/4IGKGYuWy3kTpvtabedlWq99E9PYrDJHD8E8CANDjnboIRgmAwHwi
+ZKqc5rNXIBl7fJgFdf96cWiMF/7j2nJuarJGJRQUGxDaBi5zZSTZnwfVJZrDboyb
+JCahLTMCAMpqP0wTM4Qs95HhJUBmAdBhqxXjiAMtMDnn0ue8qAtv4JRjPkfxXUsC
+4J4PExw6eMU7BCGInel5B6+jdpvURf8B/3koVTHTxyBR/OTpP8XiwOwreb/SleIS
+JMYiXx6akUoPtACfXyBYM0fqCNCq38ZYhNM89oJbu1Rm5LJHe0m0DY6d4c0AwrQE
+EwEKAB4FAl2bZaMCGy8DCwkHAxUKCAIeAQIXgAMWAgECGQEACgkQZLv1XZLsPSjC
+0wP9FP6jgFAnw1JAEOCRh/ja4467VR3oa43z2dfqfbTIBluapDwIecdj5ByXp+3g
+edsho2sjdqun8LYL5zAXKma3UErIUQlRc7t+3eL8jGeOkKisPIAwINyQO+q6ZrUt
+a1Qctvmz9m4YxIeeG6OLvghFa4ih8091/tsJlbUYxtb2M1THwRgEXZtlowEEAL38
+zaNkPmUVQaowP696fayBo18Nxs0yOzC4+0TYv1B/k5aUb0Air2h+o/Xw4E42Jh9g
+VdPSvhOAEqdV0UDe71wxa4cfAVMDY9v8ta81MWunChj3ISUk1oIQylTJNsY/b4KW
+OrLaOtBD9dyFGCzss5vLVdqdMjVIW2Cz0hb6IYG7ABEBAAEAA/4xkx7hrM2vOL26
+t/5WPsM+WVGVAxZGAv549zvxuhEp4zBS0Ya6GJLm1GzaRzFwlyaZd1zN+ibJFdlI
+OtdwcvvIAqNBsJMcjl2eaVtWK/PYvwqS7mVfojK8zUsKKNFIL6z/JKv7gmXzGuKV
+S5aYUOUMQI3mliTuqQpfLewhYBtOeQIA42jDWJfxjWiejV6QSNmBYhLeOwi/CFrd
+YE6obpXqX0V3vVOqB1rw/VHfabkWBmdOu55muw9kCLYOR89HNF6NrwIA1d+cTU7p
+eFgSUm/u1esS1ucAoxdOPZ7pkLv9+NLQNvjLThmOHCFXyTZr4aoHtnqSG8PcUAWs
+hyQ35+WpKWA7tQH9GqDFogK+8GjzgVl+vCEnaTV7H/69tS93m9z06hFRs4iEZwWC
+4oCUNqOFj6IFyiBf2cM0pmMX0ODLnIG5SDVfWaIFwsCDBBgBCgAPBQJdm2WjBQkP
+CZwAAhsuAKgJEGS79V2S7D0onSAEGQEKAAYFAl2bZaMACgkQNejFNrtoRU1/iQQA
+mdu8ZNAH58to40qEc6izK4cxOwwRnINkKnnDHTa3tdoVaJqQFnEuJTRZj0oSkYul
+E/GW9/Jw+N78H6sGSJp+tHTj6qgHqd2BfwMZtbuRyW9GjBLG/DvY1bFZjSb/Y1U8
+z3ZUxhUI7mniX5OZcMQfufzvTXIA4T4EQJPcW+Ba0/sc5gP+LQ9dQgHXCE1JE2U+
+GTqNuNfAxnmomhKlnCJGXkBuFYeUzI+ELWQ8LGEIVz5eWY9cyiDf9YEaygvs7WkK
+AxvKSV007XPYp0VPvnYTKp0Rqz3M9FX1VxWoh+z1AsvuFqT+q+QbOWEPREh6PhbJ
+iLw81N3vzw9En13zuL6gaxWDfPfHwRgEXZtlowEEAMlp97TD12JoI3HcDt7wyqNs
+2uGsuQPZw/FeykIBNfdK4jX13b6EyIdl8pPJp0FMhr4gLG+qjHDHJkOtodJjcJZV
+l3VXgoHmap/7dmPmuIt4ZTR21fCL/lzRt1SEFSAeIAyGLvmnTmNiKHkqw3E9wr2E
+TA+7sH5B4dREyIiCiNMZABEBAAEAA/wJeGeSwtCaSm48OM4kMms8wu4JxW7PnQon
+C79z2g25CnbXda+O+TxajXMZ+tXX7qq5PtcICxteZCbK8NuWgmF1QqWWhS2ZLbAV
+5edTc0vw8FSDwiAeiHyKa5Hs4B3uJaB54uADPyOYHPfX/NhEOfNAleDgVoa1Toqf
+R50lFsGOVwIA/cetzK3+NTZ5W+V8DGShxv4u5qAhhGZRb0GA3TPAoshVjHWY34i1
+KivtI3/tLLNTaVSVblG2VVoydKelRhsjGwIAyy0E1KI5O2EhLsVsDwx9NtO4SmUG
+REZt/LRYp1p5+nsarfeCVKQ4qQ6eqdK71Z7tEICT0JXqgSjQsKYVdscR2wH9GiyR
+LuHX3Nnh+M8lUv36ZM5XrWEypRFQaNYssRzPpqU4f9oViSPxdADonxehDP4ICmFr
+vqT+etEmjr9dzp4ZSKLswsCDBBgBCgAPBQJdm2WjBQkDwmcAAhsuAKgJEGS79V2S
+7D0onSAEGQEKAAYFAl2bZaMACgkQzdkMJSM5Bqg2rwP/Ue28m3Fdfgh5JxouZ3Dm
+2KUDhZL95B+vdMk72acdoU7SRjlyDT8cApRqYx+MIXb8WrPN1xCZnOM4zXeWIM0C
+APQ1e/sCrK58L+P+eVngNmrW9epKtZ4L6hx+dqqja9vPZGQKCsFAhA6A1gWB++OL
+k9Y6H23tWIdKEXMeAX7492zDYgP+OSPS79EWAqXL8SvmDrblWI5eiM6X5hAMrOjQ
+qzXhatD7eP41N/FC3SfhyhX7hFbagO7MJG2AS5bmSvcuCdcNwDwXd94B+7bfYgJI
+RKbr272yDwkyzGn+zmxzvMUt6ak5PNzfmadvhMZvIfDftswpGYpXIUU0GObOgP2t
+pCGTErs=
+=Ya+/
+-----END PGP PRIVATE KEY BLOCK-----`;
+
+        const message = "A Fool and His Money are Soon Parted";
+
+        const encrypted = await chef.PGPEncrypt(message, {
+            publicKeyOfRecipient: pbkey,
+        });
+        const result = await chef.PGPDecrypt(encrypted, {
+            privateKeyOfRecipient: privateKey,
+        });
+
+        assert.strictEqual(result.toString(), message);
    }),

    it("Raw deflate", () => {
@@ -860,17 +885,17 @@ smothering ampersand abreast
    it("toBase64: editableOption", () => {
        const result = toBase64("some input", {
            alphabet: {
-                value: "0-9A-W"
+                value: "0-9A-W+/a-zXYZ="
            },
        });
-        assert.strictEqual(result.toString(), "SPI1R1T0");
+        assert.strictEqual(result.toString(), "StXkPI1gRe1sT0==");
    }),

    it("toBase64: editableOptions key is value", () => {
        const result = toBase64("some input", {
-            alphabet: "0-9A-W",
+            alphabet: "0-9A-W+/a-zXYZ=",
        });
-        assert.strictEqual(result.toString(), "SPI1R1T0");
+        assert.strictEqual(result.toString(), "StXkPI1gRe1sT0==");
    }),

    it("toBase64: editableOptions default", () => {
@@ -918,10 +943,10 @@ smothering ampersand abreast
            chef.tripleDESDecrypt(
                chef.tripleDESEncrypt("Destroy Money", {
                    key: {string: "30 31 2f 30 34 2f 31 39 39 39 20 32 32 3a 33 33 3a 30 3130 31 2f 30 34", option: "Hex"},
-                    iv: {string: "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000 00 00 00 00", option: "Hex"}}),
+                    iv: {string: "00 00 00 00 00 00 00 00", option: "Hex"}}),
                {
                    key: {string: "30 31 2f 30 34 2f 31 39 39 39 20 32 32 3a 33 33 3a 30 3130 31 2f 30 34", option: "Hex"},
-                    iv: {string: "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000 00 00 00 00", option: "Hex"}
+                    iv: {string: "00 00 00 00 00 00 00 00", option: "Hex"}
                }).toString(),
            "Destroy Money");
    }),
@@ -1003,7 +1028,7 @@ ExifImageHeight: 57`);
        const zipped = chef.zip("some file content", {
            filename: "sample.zip",
            comment: "added",
-            operaringSystem: "Unix",
+            operatingSystem: "Unix",
        });

        assert.strictEqual(zipped.type, 7);
@@ -1034,5 +1059,20 @@ ExifImageHeight: 57`);
        assert.equal(unzipped.value[0].data, "some content");
    }),

+    it("YARA Rule Matching", async () => {
+        const input = "foobar foobar bar foo foobar";
+        const output = "Rule \"foo\" matches (4 times):\nPos 0, length 3, identifier $re1, data: \"foo\"\nPos 7, length 3, identifier $re1, data: \"foo\"\nPos 18, length 3, identifier $re1, data: \"foo\"\nPos 22, length 3, identifier $re1, data: \"foo\"\nRule \"bar\" matches (4 times):\nPos 3, length 3, identifier $re1, data: \"bar\"\nPos 10, length 3, identifier $re1, data: \"bar\"\nPos 14, length 3, identifier $re1, data: \"bar\"\nPos 25, length 3, identifier $re1, data: \"bar\"\n";
+
+        const res = await chef.YARARules(input, {
+            rules: "rule foo {strings: $re1 = /foo/ condition: $re1} rule bar {strings: $re1 = /bar/ condition: $re1}",
+            showStrings: true,
+            showStringLengths: true,
+            showMetadata: true
+        });
+
+        assert.equal(output, res.value);
+    }),
+
+
 ]);

--- a/tests/operations/index.mjs
+++ b/tests/operations/index.mjs
@@ -95,9 +95,6 @@ import "./tests/ParseUDP.mjs";
 // Cannot test operations that use the File type yet
 // import "./tests/SplitColourChannels.mjs";

-// import "./tests/nodeApi/nodeApi.mjs";
-// import "./tests/nodeApi/ops.mjs";
-
 const testStatus = {
    allTestsPassing: true,
    counts: {
--- a/tests/operations/tests/CharEnc.mjs
+++ b/tests/operations/tests/CharEnc.mjs
@@ -69,7 +69,7 @@ TestRegister.addTests([
        ],
    },
    {
-        name: "Generate Base64 Windows Powershell",
+        name: "Generate Base64 Windows PowerShell",
        input: "ZABpAHIAIAAiAGMAOgBcAHAAcgBvAGcAcgBhAG0AIABmAGkAbABlAHMAIgAgAA==",
        expectedOutput: "dir \"c:\\program files\" ",
        recipeConfig: [
--- a/tests/operations/tests/Comment.mjs
+++ b/tests/operations/tests/Comment.mjs
@@ -42,7 +42,7 @@ TestRegister.addTests([
    {
        name: "Fork, Comment, Base64",
        input: "cat\nsat\nmat",
-        expectedOutput: "Y2F0\nc2F0\nbWF0\n",
+        expectedOutput: "Y2F0\nc2F0\nbWF0",
        recipeConfig: [
            {
                "op": "Fork",
--- a/tests/operations/tests/Fork.mjs
+++ b/tests/operations/tests/Fork.mjs
@@ -57,7 +57,7 @@ TestRegister.addTests([
    {
        name: "Fork, Conditional Jump, Encodings",
        input: "Some data with a 1 in it\nSome data with a 2 in it",
-        expectedOutput: "U29tZSBkYXRhIHdpdGggYSAxIGluIGl0\n53 6f 6d 65 20 64 61 74 61 20 77 69 74 68 20 61 20 32 20 69 6e 20 69 74\n",
+        expectedOutput: "U29tZSBkYXRhIHdpdGggYSAxIGluIGl0\n53 6f 6d 65 20 64 61 74 61 20 77 69 74 68 20 61 20 32 20 69 6e 20 69 74",
        recipeConfig: [
            {"op": "Fork", "args": ["\\n", "\\n", false]},
            {"op": "Conditional Jump", "args": ["1", false, "skipReturn", "10"]},
--- a/tests/operations/tests/StrUtils.mjs
+++ b/tests/operations/tests/StrUtils.mjs
@@ -15,7 +15,29 @@ TestRegister.addTests([
        recipeConfig: [
            {
                "op": "Diff",
-                "args": ["\\n\\n", "Character", true, true, false]
+                "args": ["\\n\\n", "Character", true, true, false, false]
+            }
+        ],
+    },
+    {
+        name: "Diff added with subtraction, basic usage",
+        input: "testing23\n\ntesting123",
+        expectedOutput: "<span class='hl5'>1</span>",
+        recipeConfig: [
+            {
+                "op": "Diff",
+                "args": ["\\n\\n", "Character", true, true, true, false]
+            }
+        ],
+    },
+    {
+        name: "Diff removed with subtraction, basic usage",
+        input: "testing123\n\ntesting3",
+        expectedOutput: "<span class='hl3'>12</span>",
+        recipeConfig: [
+            {
+                "op": "Diff",
+                "args": ["\\n\\n", "Character", true, true, true, false]
            }
        ],
    },
Author	SHA1	Message	Date
n1474335	0630c094e0	9.7.20	2019-10-31 13:00:22 +00:00
n1474335	ace71f20b3	Merge branch 'gsilvapt-master'	2019-10-31 13:00:15 +00:00
Gustavo Silva	9108b3923b	diff.mjs: Fixes tests and adds default flag * Sets default flag to `false` for `showSubtraction` flag. * Removes extra span for else case that was causing some tests to fail. Moreover, the previous behavior was defined as that. * Adds custom test for the showSubtraction option, both using the `showAdded` and `showRemoved` flags.	2019-10-29 23:39:14 +00:00
Gustavo Silva	726e117656	diff.mjs: Allows showing subtraction Adds "Show Subtraction" button to allow seeing only the difference between two texts. When selected and combined, user can see only the characters or words that were added. If not combined, with either removed or added but selected, then nothing is displayed.	2019-10-29 23:12:24 +00:00
n1474335	05e65a74ce	Improved Magic scoring slightly	2019-10-28 17:26:13 +00:00
n1474335	6d138f345f	9.7.19	2019-10-27 15:27:36 +00:00
n1474335	3c165dd7e8	Merge branch 'mattnotmitt-chores/yara-update'	2019-10-27 15:27:12 +00:00
n1474335	04561d29b5	Dependency update	2019-10-27 15:26:48 +00:00
n1474335	e5e6c1a2dd	Merge branch 'chores/yara-update' of https://github.com/mattnotmitt/CyberChef into mattnotmitt-chores/yara-update	2019-10-27 15:23:47 +00:00
n1474335	882efea314	Updated README	2019-10-27 15:21:41 +00:00
n1474335	89d979d92e	Merge branch 'rianadon-theme-by-url'	2019-10-27 15:17:33 +00:00
n1474335	383aab5f85	Improved theme selection. Added changeTheme method.	2019-10-27 15:17:06 +00:00
n1474335	6659174f88	Merge branch 'theme-by-url' of https://github.com/rianadon/CyberChef into rianadon-theme-by-url	2019-10-27 14:43:59 +00:00
n1474335	3ca29b8744	Merge branch 'brian-digital-labs-autofocus-search'	2019-10-27 14:39:05 +00:00
n1474335	726bf3345e	Added tabindex to ingredients	2019-10-27 14:38:55 +00:00
n1474335	b2d61482d5	Merge branch 'autofocus-search' of https://github.com/brian-digital-labs/CyberChef into brian-digital-labs-autofocus-search	2019-10-27 14:17:06 +00:00
n1474335	88d8e9a7f9	9.7.18	2019-10-27 14:13:37 +00:00
n1474335	0b0ddd3140	Merge branch 'mattnotmitt-chores/nightwatch-update'	2019-10-27 14:12:22 +00:00
Matt	3d4f74945c	Update nightwatch and chromedriver Rebase onto master	2019-10-26 16:59:41 +01:00
Matt	4387038351	Update libyara-wasm	2019-10-26 16:14:25 +01:00
Brian Hoang	49f444dfe9	auto focus on search bar and made searchbar and text area tab-able	2019-10-26 15:30:27 +01:00
Ryan Adolf	061533bb57	Document theme option in README	2019-10-24 16:37:10 -07:00
Ryan Adolf	6e2fb67d76	Theme configuration through url	2019-10-24 16:32:14 -07:00
n1474335	60f5093c6c	Update .travis.yml	2019-10-21 13:56:52 +01:00
n1474335	665f91ec37	Update README.md	2019-10-21 13:49:42 +01:00
n1474335	0805a011b9	9.7.17	2019-10-18 13:57:26 +01:00
n1474335	3e3322e1f0	Fork no longer appends its merge delimiter to the end of the output. Closes #692	2019-10-18 13:57:21 +01:00
Matt	252b1b65c4	Add YARA rules node test	2019-10-18 12:58:17 +01:00
Matt	e8b4536ec2	Updated yara to v3.11.0 and openssl to v1.1.1d finally managed to fudge the compiler	2019-10-18 12:57:13 +01:00
n1474335	61d40b5a0b	9.7.16	2019-10-18 11:11:17 +01:00
n1474335	d175aa958c	DES no longer requires an IV in ECB mode	2019-10-18 11:09:12 +01:00
n1474335	ac3c220789	9.7.15	2019-10-16 17:36:25 +01:00
n1474335	add65e121a	Merge branch 'Storms-Engineering-master'	2019-10-16 17:36:02 +01:00
n1474335	de2e757691	Merge branch 'master' of https://github.com/Storms-Engineering/CyberChef into Storms-Engineering-master	2019-10-16 17:34:58 +01:00
n1474335	eb34ab4f6a	9.7.14	2019-10-16 17:23:59 +01:00
n1474335	08e4232166	Merge branch 'wh0-backslash'	2019-10-16 17:23:47 +01:00
n1474335	adf9772928	Added tests for Utils.parseEscapedChars	2019-10-16 17:22:48 +01:00
n1474335	562171ec86	Merge branch 'backslash' of https://github.com/wh0/CyberChef into wh0-backslash	2019-10-16 16:47:01 +01:00
n1474335	e9e162319f	Merge branch 'BjoernAkAManf-master'	2019-10-16 16:32:20 +01:00
n1474335	17c9ffe107	Tidied up chainCommands function in Gruntfile	2019-10-16 16:32:06 +01:00
n1474335	1831c84a29	Merge branch 'master' of https://github.com/BjoernAkAManf/CyberChef into BjoernAkAManf-master	2019-10-16 16:23:09 +01:00
n1474335	7e27449204	Fixed search box appaerance in Firefox	2019-10-16 16:12:22 +01:00
n1474335	282476d530	Merge branch 'Xenonym-chore/remove-duplicate-issue-template'	2019-10-16 16:04:49 +01:00
n1474335	fce0728d5d	Updated bug report template	2019-10-16 16:04:36 +01:00
n1474335	0e9ac90607	Merge branch 'chore/remove-duplicate-issue-template' of https://github.com/Xenonym/CyberChef into Xenonym-chore/remove-duplicate-issue-template	2019-10-16 15:59:59 +01:00
n1474335	5383f56b26	9.7.13	2019-10-16 15:51:06 +01:00
n1474335	a02484c6cd	Merge branch 'Storms-Engineering-IV-length-Error'	2019-10-16 15:50:51 +01:00
n1474335	be365f66ef	Added length check to Triple DES IVs	2019-10-16 15:50:37 +01:00
n1474335	011dc09d5e	Merge branch 'IV-length-Error' of https://github.com/Storms-Engineering/CyberChef into Storms-Engineering-IV-length-Error	2019-10-16 15:43:47 +01:00
n1474335	fc4d6d2d2e	9.7.12	2019-10-16 15:39:56 +01:00
n1474335	9d73127cae	Fixed some typos	2019-10-16 15:38:20 +01:00
n1474335	223743e3b5	Removed Clippy	2019-10-16 15:37:18 +01:00
n1474335	44ed372f21	9.7.11	2019-10-16 15:10:16 +01:00
n1474335	4d1f970105	Added test to ensure all operations are in a category. Added various operations to categories.	2019-10-16 15:10:03 +01:00
n1474335	b28a891a40	9.7.10	2019-10-15 16:26:01 +01:00
n1474335	834ff95702	Base64 operations now throw a meaningful error if the alphabet is the wrong length	2019-10-15 16:25:52 +01:00
Storms-Engineering	3e93580aa4	DES Encrypt/Decrypt - checks length of IV string Checks the length of IV string when encrypting. DES encrypt/decrypt test swas updated to use utf8 instead of HEX.	2019-10-12 09:42:13 -08:00
Storms-Engineering	7a3ca027bb	PHP Deserialize NULL values converted to correctly PHP Deserialize now correctly returns N as a null instead of an empty object	2019-10-12 05:56:10 -08:00
Tan Zhen Yong	3c021919dd	Rename feature request issue template - to remain consistent with other issue templates using a `-` instead of `_`	2019-10-12 16:17:40 +08:00
Tan Zhen Yong	2106e8ddb0	Remove duplicate bug report issue template The bug report issue template is duplicated (`bug-report.md` and `bug_report.md`, note the `-`/`_` difference). Thus, GitHub was unable to use the bug report issue template, and it does not show up when a new issue is being created. Let's remove the duplicate template `bug_report.md`.	2019-10-12 16:13:40 +08:00
n1474335	3472484601	Merge branch 'd98762625-fix-node-tests'	2019-10-09 16:19:39 +01:00
n1474335	826a8c8a74	Merge branch 'fix-node-tests' of https://github.com/d98762625/CyberChef into d98762625-fix-node-tests	2019-10-09 16:18:54 +01:00
n1474335	c66703f0ca	9.7.9	2019-10-09 16:14:47 +01:00
n1474335	874e7d8d54	Merge branch 'expose-operationerror'	2019-10-09 16:14:38 +01:00
n1474335	4e2b85b8c8	Merge branch 'master' into expose-operationerror	2019-10-09 16:14:03 +01:00
n1474335	5314a456cb	9.7.8	2019-10-09 16:12:46 +01:00
n1474335	ba2a5b195c	Improved PE extractor to also carve the overlay if possible	2019-10-09 16:12:41 +01:00
d98762625	f8115671ee	fix linting tests	2019-10-07 18:05:28 +01:00
d98762625	494279edd8	update gitignore	2019-10-07 18:01:35 +01:00
d98762625	bd6673afed	Merge branch 'master' of github.com:gchq/CyberChef into expose-operationerror	2019-10-07 17:59:00 +01:00
d98762625	210daf7324	make async node tests actually fail when they fail. Update tests that were failing	2019-10-07 17:41:51 +01:00
wh0	d60d595254	Utils: don't consume three backslashes at a time	2019-10-06 17:07:58 -07:00
n1474335	06708949a1	9.7.7	2019-10-04 17:52:15 +01:00
n1474335	da901e20d9	Added several more file signatures. The background magic button now highlights when a file type has been detected.	2019-10-04 17:52:09 +01:00
Björn Heinrichs	c28999ec6f	Fixed building on Windows On Windows OperationConfig was not generated. See #360 #645 for more Information.	2019-10-03 02:23:18 +02:00
d98762625	014e70a7b1	add node index to source	2019-09-20 18:44:13 +01:00
d98762625	5148b16246	Export cyberchef error types to be used in consuming applications	2019-09-20 18:40:21 +01:00