diff --git a/tests/repository_data/generate.py b/tests/repository_data/generate.py index e0b6bd57..ef0c2f9a 100755 --- a/tests/repository_data/generate.py +++ b/tests/repository_data/generate.py @@ -29,8 +29,8 @@ import stat from tuf.repository_tool import * -import tuf.ssl_crypto.util +import securesystemslib parser = optparse.OptionParser() parser.add_option("-k","--keys", action='store_true', dest="should_generate_keys", @@ -43,7 +43,7 @@ repository = create_new_repository('repository') root_key_file = 'keystore/root_key' -targets_key_file = 'keystore/targets_key' +targets_key_file = 'keystore/targets_key' snapshot_key_file = 'keystore/snapshot_key' timestamp_key_file = 'keystore/timestamp_key' delegation_key_file = 'keystore/delegation_key' @@ -86,7 +86,7 @@ repository.timestamp.add_verification_key(timestamp_public) # Load the signing keys, previously imported, for the top-level roles so that -# valid metadata can be written. +# valid metadata can be written. repository.root.load_signing_key(root_private) repository.targets.load_signing_key(targets_private) repository.snapshot.load_signing_key(snapshot_private) @@ -95,11 +95,11 @@ # Create the target files (downloaded by clients) whose file size and digest # are specified in the 'targets.json' file. target1_filepath = 'repository/targets/file1.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target1_filepath) +securesystemslib.util.ensure_parent_dir(target1_filepath) target2_filepath = 'repository/targets/file2.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target2_filepath) +securesystemslib.util.ensure_parent_dir(target2_filepath) target3_filepath = 'repository/targets/file3.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target2_filepath) +securesystemslib.util.ensure_parent_dir(target2_filepath) if not options.dry_run: with open(target1_filepath, 'wt') as file_object: @@ -142,7 +142,7 @@ repository.snapshot.compressions = ['gz'] repository.timestamp.compressions = ['gz'] -# Create the actual metadata files, which are saved to 'metadata.staged'. +# Create the actual metadata files, which are saved to 'metadata.staged'. if not options.dry_run: repository.writeall() diff --git a/tests/repository_data/generate_project_data.py b/tests/repository_data/generate_project_data.py index 4fa420bb..dabd6dc4 100755 --- a/tests/repository_data/generate_project_data.py +++ b/tests/repository_data/generate_project_data.py @@ -20,9 +20,10 @@ import optparse import os -import tuf.ssl_crypto.util from tuf.developer_tool import * +import securesystemslib + parser = optparse.OptionParser() parser.add_option("-d","--dry-run", action='store_true', dest="dry_run", @@ -31,7 +32,7 @@ project_key_file = 'keystore/root_key' -targets_key_file = 'keystore/targets_key' +targets_key_file = 'keystore/targets_key' delegation_key_file = 'keystore/delegation_key' # The files we use for signing in the unit tests should exist, if they are not @@ -59,11 +60,11 @@ # Create the target files (downloaded by clients) whose file size and digest # are specified in the 'targets.json' file. target1_filepath = 'project/targets/file1.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target1_filepath) +securesystemslib.util.ensure_parent_dir(target1_filepath) target2_filepath = 'project/targets/file2.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target2_filepath) +securesystemslib.util.ensure_parent_dir(target2_filepath) target3_filepath = 'project/targets/file3.txt' -tuf.ssl_crypto.util.ensure_parent_dir(target2_filepath) +securesystemslib.util.ensure_parent_dir(target2_filepath) if not options.dry_run: with open(target1_filepath, 'wt') as file_object: @@ -101,6 +102,6 @@ # example of compressed metadata. project.compressions = ['gz'] -# Create the actual metadata files, which are saved to 'metadata.staged'. +# Create the actual metadata files, which are saved to 'metadata.staged'. if not options.dry_run: project.write()