Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt

src/js/config/OperationConfig.js

@@ -209,7 +209,7 @@ var OperationConfig = {
         ]
     },
     "XOR": {
-        description: "XOR the input with the given key.<br>e.g. <code>fe023da5</code><br><br><strong>Options</strong><br><u>Null preserving:</u> If the current byte is 0x00 or the same as the key, skip it.<br><br><u>Differential:</u> Set the key to the value of the previously decoded byte.",
+        description: "XOR the input with the given key.<br>e.g. <code>fe023da5</code><br><br><strong>Options</strong><br><u>Null preserving:</u> If the current byte is 0x00 or the same as the key, skip it.<br><br><u>Scheme:</u><ul><li>Standard - key is unchanged after each round</li><li>Input differential - key is set to the value of the previous unprocessed byte</li><li>Output differential - key is set to the value of the previous processed byte</li></ul>",
         run: BitwiseOp.run_xor,
         highlight: true,
         highlight_reverse: true,
@@ -222,15 +222,15 @@ var OperationConfig = {
                 value: "",
                 toggle_values: BitwiseOp.KEY_FORMAT
             },
+            {
+                name: "Scheme",
+                type: "option",
+                value: BitwiseOp.XOR_SCHEME
+            },
             {
                 name: "Null preserving",
                 type: "boolean",
                 value: BitwiseOp.XOR_PRESERVE_NULLS
-            },
-            {
-                name: "Differential",
-                type: "boolean",
-                value: BitwiseOp.XOR_DIFFERENTIAL
             }
         ]
     },

src/js/operations/BitwiseOp.js

@@ -19,10 +19,10 @@ var BitwiseOp = {
      * @param {byte_array} key
      * @param {function} func - The bitwise calculation to carry out
      * @param {boolean} null_preserving
-     * @param {boolean} differential
+     * @param {string} scheme
      * @returns {byte_array}
      */
-    _bit_op: function (input, key, func, null_preserving, differential) {
+    _bit_op: function (input, key, func, null_preserving, scheme) {
         if (!key || !key.length) key = [0];
         var result = [],
             x = null,
@@ -34,8 +34,15 @@ var BitwiseOp = {
             o = input[i];
             x = null_preserving && (o === 0 || o == k) ? o : func(o, k);
             result.push(x);
-            if (differential && !(null_preserving && (o === 0 || o == k))) {
-                key[i % key.length] = x;
+            if (scheme != "Standard" && !(null_preserving && (o === 0 || o == k))) {
+                switch (scheme) {
+                    case "Input differential":
+                        key[i % key.length] = x;
+                        break;
+                    case "Output differential":
+                        key[i % key.length] = o;
+                        break;
+                }
             }
         }
         
@@ -52,7 +59,7 @@ var BitwiseOp = {
      * @constant
      * @default
      */
-    XOR_DIFFERENTIAL: false,
+    XOR_SCHEME: ["Standard", "Input differential", "Output differential"],
     /**
      * @constant
      * @default
@@ -68,12 +75,12 @@ var BitwiseOp = {
      */
     run_xor: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || ""),
-            null_preserving = args[1],
-            differential = args[2];
+            scheme = args[1],
+            null_preserving = args[2];
         
         key = Utils.word_array_to_byte_array(key);
             
-        return BitwiseOp._bit_op(input, key, BitwiseOp._xor, null_preserving, differential);
+        return BitwiseOp._bit_op(input, key, BitwiseOp._xor, null_preserving, scheme);
     },
     
     

src/js/operations/Code.js

@@ -64,6 +64,7 @@ var Code = {
      */
     run_json_beautify: function(input, args) {
         var indent_str = args[0];
+        if (!input) return "";
         return vkbeautify.json(input, indent_str);
     },
     
@@ -121,6 +122,7 @@ var Code = {
      * @returns {string}
      */
     run_json_minify: function(input, args) {
+        if (!input) return "";
         return vkbeautify.jsonmin(input);
     },