From c0d8aceccb0961a25ee58a163441bbcbe6d6ea3d Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Fri, 27 Jan 2017 16:11:11 +0100
Subject: Verify config file signature

Read log key from config file in more places.
Check STH signature in storagegc.py
---
 tools/mergetools.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/mergetools.py')

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)
 
-- 
cgit v1.1