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/mergetools.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/mergetools.py')
| -rw-r--r-- | tools/mergetools.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mergetools.py b/tools/mergetools.py index f49e789..0afec24 100644 --- a/tools/mergetools.py +++ b/tools/mergetools.py @@ -7,7 +7,7 @@ import hashlib import sys import struct import json -import yaml +import readconfig import argparse import requests try: @@ -430,8 +430,8 @@ def parse_args(): help="Print timing information") args = parser.parse_args() - config = yaml.load(open(args.config)) - localconfig = yaml.load(open(args.localconfig)) + localconfig = readconfig.read_config(args.localconfig) + config = readconfig.verify_and_read_config(args.config, localconfig["logadminkey"]) set_api_keys(config) |