From 7725ebddac1e672c81726fda9718352e44f3f547 Mon Sep 17 00:00:00 2001 From: marinamoore Date: Thu, 2 Apr 2020 13:39:32 -0700 Subject: [PATCH] Add an optional parameter to format_metadata_to_key that allows the caller to provide a default keyid. This will help remove the depenency on keyid_hash_algorithms in tuf while remaining backwards compatible --- securesystemslib/keys.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/securesystemslib/keys.py b/securesystemslib/keys.py index 44262d0c..cab6c4bb 100755 --- a/securesystemslib/keys.py +++ b/securesystemslib/keys.py @@ -474,7 +474,7 @@ def format_keyval_to_metadata(keytype, scheme, key_value, private=False): -def format_metadata_to_key(key_metadata): +def format_metadata_to_key(key_metadata, default_keyid=None): """ Construct a key dictionary (e.g., securesystemslib.formats.RSAKEY_SCHEMA) @@ -544,7 +544,8 @@ def format_metadata_to_key(key_metadata): # Convert 'key_value' to 'securesystemslib.formats.KEY_SCHEMA' and generate # its hash The hash is in hexdigest form. - default_keyid = _get_keyid(keytype, scheme, key_value) + if (default_keyid == None): + default_keyid = _get_keyid(keytype, scheme, key_value) keyids = set() keyids.add(default_keyid)