summaryrefslogtreecommitdiff
path: root/tools/merge.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-08-17 17:46:46 +0200
committerMagnus Ahltorp <map@kth.se>2015-08-17 18:09:59 +0200
commitfd33d62b9e8849a3cca344994183f4fe9fa54d81 (patch)
tree0a87310ea664d68745414bbe23f9589d7c633491 /tools/merge.py
parent6904422f3e8ca95ece5a309ef121a6cd6159e0a8 (diff)
Wrap entries in plop wrapperplopstoragefix
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="")