summaryrefslogtreecommitdiff
path: root/tools/certtools.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-05-22 16:23:13 +0200
committerMagnus Ahltorp <map@kth.se>2015-05-22 16:23:13 +0200
commitb3cf7d7737f1fb32bff222e184ae62a3b44f736f (patch)
tree2b4a0d21b48a692ad58412b63bfb29d4df8db2e0 /tools/certtools.py
parent0fe29c04e47b6660cf816f615537a61028c4deb9 (diff)
Don't require --publickey, but print better error message.
Diffstat (limited to 'tools/certtools.py')
-rw-r--r--tools/certtools.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/certtools.py b/tools/certtools.py
index 405aabd..ccbc76e 100644
--- a/tools/certtools.py
+++ b/tools/certtools.py
@@ -219,7 +219,12 @@ def encode_signature(hash_alg, signature_alg, unpacked_signature):
def check_signature(baseurl, signature, data, publickey=None):
if publickey == None:
- publickey = base64.decodestring(publickeys[baseurl])
+ if baseurl in publickeys:
+ publickey = base64.decodestring(publickeys[baseurl])
+ else:
+ print >>sys.stderr, "Public key for", baseurl, \
+ "not found, specify key file with --publickey"
+ sys.exit(1)
(hash_alg, signature_alg, unpacked_signature) = decode_signature(signature)
assert hash_alg == 4, \
"hash_alg is %d, expected 4" % (hash_alg,) # sha256