diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-01-27 16:11:11 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-01 10:46:27 +0100 |
| commit | c0d8aceccb0961a25ee58a163441bbcbe6d6ea3d (patch) | |
| tree | 90c98ad5f286a2475c1dd04ca7ddd70df6669aea /tools/merge_sth.py | |
| parent | 50667bc5c4896557415ab28269d2aea3ac534bf4 (diff) | |
Verify config file signature
Read log key from config file in more places.
Check STH signature in storagegc.py
Diffstat (limited to 'tools/merge_sth.py')
| -rwxr-xr-x | tools/merge_sth.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/merge_sth.py b/tools/merge_sth.py index 6b1bb60..2bc19dd 100755 --- a/tools/merge_sth.py +++ b/tools/merge_sth.py @@ -12,6 +12,7 @@ import json import urllib2 import time import requests +import base64 from base64 import b64encode from mergetools import parse_args, get_nfetched, hexencode, hexdecode, \ get_logorder, get_sth @@ -31,7 +32,7 @@ def merge_sth(args, config, localconfig): sthfile = mergedb + "/sth" logorderfile = mergedb + "/logorder" currentsizefile = mergedb + "/fetched" - logpublickey = get_public_key_from_file(paths["logpublickey"]) + logpublickey = base64.decodestring(config["logpublickey"]) backupquorum = config.get("backup-quorum-size", 0) assert backupquorum <= len(mergenodes) - 1 create_ssl_context(cafile=paths["https_cacertfile"]) |