summaryrefslogtreecommitdiff
path: root/tools/merge.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-04-10 15:42:03 +0200
committerMagnus Ahltorp <map@kth.se>2015-04-10 15:44:26 +0200
commit6402eeefc18c47b7dceea5e0dda0b8aeec6719bd (patch)
tree56b0e91fabdc01c17fe37a44f77b707060171a30 /tools/merge.py
parent263862c06abd93d39d98fd40007f80b5fe57f030 (diff)
Verify SSL certificates and hostnames in python codesslverify
Closes CATLFISH-34
Diffstat (limited to 'tools/merge.py')
-rwxr-xr-xtools/merge.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/merge.py b/tools/merge.py
index ce3bf0b..c9d73fb 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -20,7 +20,8 @@ import select
import struct
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
+ get_public_key_from_file, get_leaf_hash, decode_certificate_chain, \
+ create_ssl_context
parser = argparse.ArgumentParser(description="")
parser.add_argument('--config', help="System configuration", required=True)
@@ -39,6 +40,7 @@ paths = localconfig["paths"]
mergedb = paths["mergedb"]
signingnodes = config["signingnodes"]
+create_ssl_context(cafile=paths["https_cacertfile"])
chainsdir = mergedb + "/chains"
logorderfile = mergedb + "/logorder"