summaryrefslogtreecommitdiff
path: root/tools/merge.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-08-17 17:46:46 +0200
committerLinus Nordberg <linus@nordu.net>2015-08-19 16:26:07 +0200
commitaa703d32d55717b4934c91cf187f0ed165196fd0 (patch)
treefcf5bb88410aab1eda0767cd00dd41cc8cb10acc /tools/merge.py
parent3464a089a9ccbac1a8bc92c8dfba402e7e307733 (diff)
Wrap entries in plop wrapper
Diffstat (limited to 'tools/merge.py')
-rwxr-xr-xtools/merge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/merge.py b/tools/merge.py
index 7453fa4..f02ce39 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -22,7 +22,7 @@ from certtools import build_merkle_tree, create_sth_signature, \
check_sth_signature, get_eckey_from_file, timing_point, http_request, \
get_public_key_from_file, get_leaf_hash, decode_certificate_chain, \
create_ssl_context
-from mergetools import parselogrow, get_logorder, read_chain, unpack_entry, \
+from mergetools import parselogrow, get_logorder, read_chain, \
verify_entry
parser = argparse.ArgumentParser(description="")