From 4ca14ed0ceda3a95d585fdeb7245e8c24172b8e6 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Wed, 13 Jun 2018 13:00:49 +0000
Subject: [PATCH] 'From Hexdump' now supports an alternative style of Wireshark
 hexdumps. Test added.

---
 src/core/operations/FromHexdump.mjs |  4 ++--
 test/tests/operations/Hexdump.mjs   | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/core/operations/FromHexdump.mjs b/src/core/operations/FromHexdump.mjs
index fc10b7a9..85d74c16 100644
--- a/src/core/operations/FromHexdump.mjs
+++ b/src/core/operations/FromHexdump.mjs
@@ -26,7 +26,7 @@ class FromHexdump extends Operation {
         this.args = [];
         this.patterns = [
             {
-                match: "^(?:(?:[\\dA-F]{4,16}:?)?\\s*((?:[\\dA-F]{2}\\s){1,8}(?:\\s|[\\dA-F]{2}-)(?:[\\dA-F]{2}\\s){1,8}|(?:[\\dA-F]{2}\\s|[\\dA-F]{4}\\s)+)[^\\n]*\\n?)+$",
+                match: "^(?:(?:[\\dA-F]{4,16}h?:?)?[ \\t]*((?:[\\dA-F]{2} ){1,8}(?:[ \\t]|[\\dA-F]{2}-)(?:[\\dA-F]{2} ){1,8}|(?:[\\dA-F]{4} )*[\\dA-F]{4}|(?:[\\dA-F]{2} )*[\\dA-F]{2})[^\\n]*\\n?)+$",
                 flags: "i",
                 args: []
             },
@@ -40,7 +40,7 @@ class FromHexdump extends Operation {
      */
     run(input, args) {
         const output = [],
-            regex = /^\s*(?:[\dA-F]{4,16}h?:?)?\s*((?:[\dA-F]{2}\s){1,8}(?:\s|[\dA-F]{2}-)(?:[\dA-F]{2}\s){1,8}|(?:[\dA-F]{2}\s|[\dA-F]{4}\s)+)/igm;
+            regex = /^\s*(?:[\dA-F]{4,16}h?:?)?[ \t]+((?:[\dA-F]{2} ){1,8}(?:[ \t]|[\dA-F]{2}-)(?:[\dA-F]{2} ){1,8}|(?:[\dA-F]{4} )*[\dA-F]{4}|(?:[\dA-F]{2} )*[\dA-F]{2})/igm;
         let block, line;
 
         while ((block = regex.exec(input))) {
diff --git a/test/tests/operations/Hexdump.mjs b/test/tests/operations/Hexdump.mjs
index 7dff3f81..3dc1ce7c 100644
--- a/test/tests/operations/Hexdump.mjs
+++ b/test/tests/operations/Hexdump.mjs
@@ -179,6 +179,32 @@ TestRegister.addTests([
             }
         ],
     },
+    {
+        name: "From Hexdump: Wireshark alt",
+        input: `0000   00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
+0010   10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
+0020   20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f
+0030   30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f
+0040   40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f
+0050   50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f
+0060   60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f
+0070   70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f
+0080   80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f
+0090   90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f
+00a0   a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af
+00b0   b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
+00c0   c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf
+00d0   d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df
+00e0   e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef
+00f0   f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff`,
+        expectedOutput: ALL_BYTES,
+        recipeConfig: [
+            {
+                op: "From Hexdump",
+                args: []
+            }
+        ],
+    },
     {
         name: "From Hexdump: 010",
         input: `0000h: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F  ................