summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/merge_dist.py4
-rw-r--r--tools/mergetools.py4
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index 2b2f259..bfc0e61 100644
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -9,9 +9,9 @@ import urllib2
import base64
import select
from certtools import timing_point, check_sth_signature, \
- get_public_key_from_file
+ create_sth_signature, get_public_key_from_file
from mergetools import get_curpos, get_logorder, chunks, get_missingentries, \
- sendsth, create_sth_signature, hexencode, sendlog, sendentry, read_chain
+ sendsth, hexencode, sendlog, sendentry, read_chain
def merge_dist(args, config, localconfig, sth_in):
paths = localconfig["paths"]
diff --git a/tools/mergetools.py b/tools/mergetools.py
index 7f1b2af..c474796 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -9,9 +9,7 @@ import struct
import urllib
import urllib2
import json
-from certtools import get_leaf_hash, create_sth_signature, \
- check_sth_signature, get_eckey_from_file, http_request, \
- get_leaf_hash, decode_certificate_chain
+from certtools import get_leaf_hash, http_request, get_leaf_hash
def parselogrow(row):
return base64.b16decode(row, casefold=True)