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/loginfo.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/loginfo.py')
| -rwxr-xr-x | tools/loginfo.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/loginfo.py b/tools/loginfo.py index c61ad1b..1537c5e 100755 --- a/tools/loginfo.py +++ b/tools/loginfo.py @@ -6,7 +6,7 @@ import sys import argparse -import yaml +import readconfig from certtools import create_ssl_context, get_sth def main(): @@ -26,8 +26,7 @@ def main(): required=True) parser.add_argument('baseurl', help="Log base URL") args = parser.parse_args() - #config = yaml.load(open(args.config)) - localconfig = yaml.load(open(args.localconfig)) + localconfig = readconfig.read_config(args.localconfig) paths = localconfig["paths"] create_ssl_context(cafile=paths["https_cacertfile"]) |