Verify config file signature

Read log key from config file in more places.
Check STH signature in storagegc.py

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)