Skip to content

Commit

Permalink
Merge pull request #42 from secure-systems-lab/fix_get_keyid_bug
Browse files Browse the repository at this point in the history
Fix bug in _get_keyid()
  • Loading branch information
vladimir-v-diaz authored Jul 17, 2017
2 parents 2afa062 + 0d9cbd0 commit 690dd68
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions securesystemslib/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 690dd68

Please sign in to comment.