From 882ac83d8d314c5e1490197aaadd19efcbaaf168 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 19 May 2015 13:12:55 +0100 Subject: Fix scripts-dev/convert_server_keys.py to have correct format --- scripts-dev/convert_server_keys.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts-dev') diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index 024ddcdbd0..7080ec5fd2 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -47,7 +47,10 @@ def convert_v1_to_v2(server_name, valid_until, keys, certificate): return { "old_verify_keys": {}, "server_name": server_name, - "verify_keys": keys, + "verify_keys": { + key_id: {"key": key} + for key_id, key in keys + }, "valid_until_ts": valid_until, "tls_fingerprints": [fingerprint(certificate)], } -- cgit 1.4.1 From df431b127b54df3d5e5c398e48a134dc66d29ebd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 19 May 2015 13:14:21 +0100 Subject: Add forgotten .items() --- scripts-dev/convert_server_keys.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts-dev') diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index 7080ec5fd2..a1ee39059c 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -49,7 +49,7 @@ def convert_v1_to_v2(server_name, valid_until, keys, certificate): "server_name": server_name, "verify_keys": { key_id: {"key": key} - for key_id, key in keys + for key_id, key in keys.items() }, "valid_until_ts": valid_until, "tls_fingerprints": [fingerprint(certificate)], -- cgit 1.4.1