From 0d9cbd058eb999e0dc77de76f676dac4aa11965b Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Mon, 17 Jul 2017 11:37:45 -0400 Subject: [PATCH] Fix bug in _get_keyid() The hash_algorithm argument to _get_keyid() wasn't correctly being used --- securesystemslib/keys.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/securesystemslib/keys.py b/securesystemslib/keys.py index 2ca71aa6..15052fcc 100755 --- a/securesystemslib/keys.py +++ b/securesystemslib/keys.py @@ -602,8 +602,8 @@ def format_metadata_to_key(key_metadata): keytype = key_metadata['keytype'] key_value = key_metadata['keyval'] - # Convert 'key_value' to 'securesystemslib.formats.KEY_SCHEMA' and generate its - # hash The hash is in hexdigest form. + # Convert 'key_value' to 'securesystemslib.formats.KEY_SCHEMA' and generate + # its hash The hash is in hexdigest form. default_keyid = _get_keyid(keytype, key_value) keyids = set() keyids.add(default_keyid) @@ -637,7 +637,7 @@ def _get_keyid(keytype, key_value, hash_algorithm = 'sha256'): # Create a digest object and call update(), using the JSON # canonical format of 'rskey_meta' as the update data. - digest_object = securesystemslib.hash.digest(_KEY_ID_HASH_ALGORITHM) + digest_object = securesystemslib.hash.digest(hash_algorithm) digest_object.update(key_update_data.encode('utf-8')) # 'keyid' becomes the hexadecimal representation of the hash.