Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update old repository tools affected by renamed function

Browse source
This commit is contained in:
vladdd 2013-11-16 12:13:25 -05:00
parent 6073cb559c
commit eb7f8a58f5
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/images/TUF repository tools.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 58 KiB

6
tuf/repo/keystore.py
View file

@ -288,9 +288,9 @@ def load_keystore_from_keyfiles(directory_name, keyids, passwords):
# supported.
if keydata['keytype'] in _SUPPORTED_KEY_TYPES:
# 'keydata' is stored in KEY_SCHEMA format. Call
# create_from_metadata_format() to get the key in RSAKEY_SCHEMA
# format_metadata_to_key() to get the key in RSAKEY_SCHEMA
# format, which is the format expected by 'add_rsakey()'.
rsa_key = tuf.keys.create_from_metadata_format(keydata)
rsa_key = tuf.keys.format_metadata_to_key(keydata)
# Ensure the keyid for 'rsa_key' is one of the keys specified in
# 'keyids'. If not, do not load the key.
@ -368,7 +368,7 @@ def save_keystore_to_keyfiles(directory_name):
keytype = key['keytype']
keyval = key['keyval']
key_metadata_format = \
tuf.keys.create_in_metadata_format(keytype, keyval, private=True)
tuf.keys.format_keyval_to_metadata(keytype, keyval, private=True)
else:
logger.warn('The keystore has a key with an unrecognized key type.')
continue

6
tuf/repo/signercli.py
View file

@ -693,7 +693,8 @@ def dump_key(keystore_directory):
if key['keytype'] == 'rsa':
keytype = key['keytype']
keyval = key['keyval']
key_metadata = tuf.keys.create_in_metadata_format(keytype, keyval,
key_metadata = tuf.keys.format_keyval_to_metadata(keytype, keyval,
#key_metadata = tuf.keys.create_in_metadata_format(keytype, keyval,
private=show_private)
else:
message = 'The keystore contains an invalid key type.'
@ -1357,7 +1358,8 @@ def _update_parent_metadata(metadata_directory, delegated_role,
if role_key['keytype'] == 'rsa':
keytype = role_key['keytype']
keyval = role_key['keyval']
keys[delegated_keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
keys[delegated_keyid] = tuf.keys.format_keyval_to_metadata(keytype, keyval)
#keys[delegated_keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
else:
message = 'Invalid keytype encountered: '+delegated_keyid+'\n'
raise tuf.RepositoryError(message)

6
tuf/repo/signerlib.py
View file

@ -22,6 +22,7 @@
import os
import ConfigParser
import logging
import time
import tuf
import tuf.formats
@ -288,7 +289,7 @@ def generate_root_metadata(config_filepath, version):
if key['keytype'] in ['rsa', 'ed25519']:
keytype = key['keytype']
keyval = key['keyval']
keydict[keyid] = tuf.keys.create_in_metadata_format(keytype, keyval)
keydict[keyid] = tuf.keys.format_keyval_to_metadata(keytype, keyval)
# This is not a recognized key. Raise an exception.
else:
raise tuf.Error('Unsupported keytype: '+keyid)
@ -309,7 +310,8 @@ def generate_root_metadata(config_filepath, version):
3600 * 24 * expiration['days'])
# Generate the root metadata object.
root_metadata = tuf.formats.RootFile.make_metadata(version, expiration_seconds,
expiration_date = tuf.formats.format_time(time.time()+expiration_seconds)
root_metadata = tuf.formats.RootFile.make_metadata(version, expiration_date,
keydict, roledict)
# Note: make_signable() returns the following dictionary: