Return correct extra-data for precerts too (closes CATLFISH-56).

Verify precerts in make tests too.

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/mergetools.py b/tools/mergetools.py
index 9e84038..9f5feee 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -31,8 +31,9 @@ def unpack_entry(entry):
     pieces = []
     while len(entry):
         (length,) = struct.unpack(">I", entry[0:4])
-        data = entry[4:4+length]
-        entry = entry[4+length:]
+        type = entry[4:8]
+        data = entry[8:length]
+        entry = entry[length:]
         pieces.append(data)
     return pieces