From 2810ce9055ac455894b6b9df96928b288d039124 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 6 Aug 2015 16:30:13 +0200 Subject: Return correct extra-data for precerts too (closes CATLFISH-56). Verify precerts in make tests too. --- tools/mergetools.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') 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 -- cgit v1.1