diff --git a/tuf/client/updater.py b/tuf/client/updater.py index 2fc8d3600e..564e285efd 100755 --- a/tuf/client/updater.py +++ b/tuf/client/updater.py @@ -952,8 +952,7 @@ def _import_delegations(self, parent_role): # We specify the keyid to ensure that it's the correct keyid # for the key. try: - key, _ = securesystemslib.keys.format_metadata_to_key(keyinfo, keyid, - keyid_hash_algorithms=keyinfo['keyid_hash_algorithms']) + key, _ = securesystemslib.keys.format_metadata_to_key(keyinfo, keyid) tuf.keydb.add_key(key, repository_name=self.repository_name) diff --git a/tuf/keydb.py b/tuf/keydb.py index 9489237fdd..bc306bac25 100755 --- a/tuf/keydb.py +++ b/tuf/keydb.py @@ -123,7 +123,7 @@ def create_keydb_from_root_metadata(root_metadata, repository_name='default'): # All other keyids returned are ignored. key_dict, _ = securesystemslib.keys.format_metadata_to_key(key_metadata, - keyid, keyid_hash_algorithms=key_metadata['keyid_hash_algorithms']) + keyid) # Make sure to update key_dict['keyid'] to use one of the other valid # keyids, otherwise add_key() will have no reference to it. diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index bcc63a7fe8..6def4006dc 100644 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -652,7 +652,7 @@ def _load_top_level_metadata(repository, top_level_filenames, repository_name): # Use the keyid found in the delegation key_object, _ = securesystemslib.keys.format_metadata_to_key(key_metadata, - keyid, keyid_hash_algorithms=key_metadata['keyid_hash_algorithms']) + keyid) # Add 'key_object' to the list of recognized keys. Keys may be shared, # so do not raise an exception if 'key_object' has already been loaded.