diff --git a/setup.py b/setup.py index 39548f29..1396f0d2 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,7 @@ -#! /usr/bin/env python +#!/usr/bin/env python + +# Copyright 2013 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 """ @@ -11,7 +14,7 @@ March 2013. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. BUILD SOURCE DISTRIBUTION diff --git a/tests/aggregate_tests.py b/tests/aggregate_tests.py index b65077a5..231ce4cb 100755 --- a/tests/aggregate_tests.py +++ b/tests/aggregate_tests.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2013 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ aggregate_tests.py @@ -16,7 +19,7 @@ unit tests. -Zane Fisher - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Run all the unit tests from every .py file beginning with "test_" in diff --git a/tests/repository_data/generate.py b/tests/repository_data/generate.py index 18064de7..2d94958a 100755 --- a/tests/repository_data/generate.py +++ b/tests/repository_data/generate.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ generate.py @@ -11,7 +14,7 @@ February 26, 2014. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provide a set of pre-generated key files and a basic repository that unit diff --git a/tests/repository_data/generate_project_data.py b/tests/repository_data/generate_project_data.py index 1d25681c..c4ec6265 100755 --- a/tests/repository_data/generate_project_data.py +++ b/tests/repository_data/generate_project_data.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ generate_project_data.py @@ -7,8 +10,11 @@ Santiago Torres + + January 22, 2014. + - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Generate a pre-fabricated set of metadata files for 'test_developer_tool.py' diff --git a/tests/simple_https_server.py b/tests/simple_https_server.py index 8c15608a..f708942b 100755 --- a/tests/simple_https_server.py +++ b/tests/simple_https_server.py @@ -1,9 +1,12 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ simple_https_server.py - + Vladimir Diaz. @@ -11,17 +14,17 @@ June 17, 2014 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provide a simple https server that can be used by the unit tests. For example, 'download.py' can connect to the https server started by this module to verify that https downloads are permitted. - + ssl.wrap_socket: https://docs.python.org/2/library/ssl.html#functions-constants-and-exceptions - + SimpleHTTPServer: http://docs.python.org/library/simplehttpserver.html#module-SimpleHTTPServer """ @@ -50,7 +53,7 @@ def _generate_random_port(): PORT = int(sys.argv[1]) if PORT < 30000 or PORT > 45000: raise ValueError - + except ValueError: PORT = _generate_random_port() diff --git a/tests/simple_server.py b/tests/simple_server.py index ba2f104e..5d8084f3 100755 --- a/tests/simple_server.py +++ b/tests/simple_server.py @@ -1,21 +1,24 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ simple_server.py - + Konstantin Andrianov. February 15, 2012. - + - See LICENSE for licensing information. + See LICENSE-MIT.txt or LICENSE-APACHE.txt for licensing information. - This is a basic server that was designed to be used in conjunction with - test_download.py to test download.py module. + This is a basic server that was designed to be used in conjunction with + test_download.py to test download.py module. SimpleHTTPServer: @@ -45,7 +48,7 @@ def _port_gen(): PORT = int(sys.argv[1]) if PORT < 30000 or PORT > 45000: raise ValueError - + except ValueError: PORT = _port_gen() diff --git a/tests/slow_retrieval_server.py b/tests/slow_retrieval_server.py index f51c80ed..dca37b90 100755 --- a/tests/slow_retrieval_server.py +++ b/tests/slow_retrieval_server.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ slow_retrieval_server.py @@ -11,7 +14,7 @@ March 13, 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Server that throttles data by sending one byte at a time (specified time @@ -54,19 +57,19 @@ def do_GET(self): data = None with open(filepath, 'r') as fileobj: data = fileobj.read() - + self.send_response(200) self.send_header('Content-length', str(len(data))) self.end_headers() - + if self.server.test_mode == 'mode_1': # Before sending any data, the server does nothing for a long time. - DELAY = 40 + DELAY = 40 time.sleep(DELAY) self.wfile.write(data) return - + # 'mode_2' else: DELAY = 1 @@ -78,7 +81,7 @@ def do_GET(self): for i in range(len(data)): self.wfile.write(data[i].encode('utf-8')) time.sleep(DELAY) - + return except IOError as e: diff --git a/tests/test_arbitrary_package_attack.py b/tests/test_arbitrary_package_attack.py index e6f7810a..b4e981e0 100755 --- a/tests/test_arbitrary_package_attack.py +++ b/tests/test_arbitrary_package_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_arbitrary_package_attack.py @@ -16,7 +19,7 @@ discontinue use of the old repository tools. -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate an arbitrary package attack, where an updater client attempts to diff --git a/tests/test_developer_tool.py b/tests/test_developer_tool.py index 7e3a7f68..3f3aad8a 100755 --- a/tests/test_developer_tool.py +++ b/tests/test_developer_tool.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_developer_tool.py. @@ -8,8 +11,11 @@ Santiago Torres Arias Zane Fisher + + January 22, 2014. + - See LICENSE for licensing inforation. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing inforation. Unit test for the 'developer_tool.py' module. diff --git a/tests/test_download.py b/tests/test_download.py index aa176885..d25bcb1b 100755 --- a/tests/test_download.py +++ b/tests/test_download.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_download.py @@ -11,7 +14,7 @@ March 26, 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'download.py'. diff --git a/tests/test_endless_data_attack.py b/tests/test_endless_data_attack.py index be0d8963..61420c17 100755 --- a/tests/test_endless_data_attack.py +++ b/tests/test_endless_data_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_endless_data_attack.py @@ -17,7 +20,7 @@ -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate an endless data attack, where an updater client tries to download a diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 232071af..06d256e2 100755 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_exceptions.py @@ -11,7 +14,7 @@ July 13, 2017. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Test cases for exceptions.py (mainly the exceptions defined there). diff --git a/tests/test_extraneous_dependencies_attack.py b/tests/test_extraneous_dependencies_attack.py index 0e78578f..caa61021 100755 --- a/tests/test_extraneous_dependencies_attack.py +++ b/tests/test_extraneous_dependencies_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2013 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_extraneous_dependencies_attack.py @@ -15,10 +18,11 @@ than verifying text output), use pre-generated repository files, and discontinue use of the old repository tools. Modify the previous scenario simulated for the mix-and-match attack. The metadata that specified the - dependencies of a project modified (previously a text file.) -vladimir.v.diaz + dependencies of a project modified (previously a text file.) + -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate an extraneous dependencies attack. The client attempts to download diff --git a/tests/test_formats.py b/tests/test_formats.py index 763e4036..1d29d48b 100755 --- a/tests/test_formats.py +++ b/tests/test_formats.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_formats.py @@ -11,7 +14,7 @@ October 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'formats.py' diff --git a/tests/test_indefinite_freeze_attack.py b/tests/test_indefinite_freeze_attack.py index 4f885492..95573a64 100755 --- a/tests/test_indefinite_freeze_attack.py +++ b/tests/test_indefinite_freeze_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_indefinite_freeze_attack.py @@ -25,7 +28,7 @@ -sebastien.awwad - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate an indefinite freeze attack. In an indefinite freeze attack, diff --git a/tests/test_init.py b/tests/test_init.py index 396b924a..e847cb43 100755 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2015 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_init.py @@ -11,7 +14,7 @@ March 30, 2015. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Test cases for __init__.py (mainly the exceptions defined there). diff --git a/tests/test_key_revocation_integration.py b/tests/test_key_revocation_integration.py index 26577b45..ad1de8f8 100755 --- a/tests/test_key_revocation_integration.py +++ b/tests/test_key_revocation_integration.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2016 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_key_revocation_integration.py @@ -11,7 +14,7 @@ April 28, 2016. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Integration test that verifies top-level roles are updated after all of their diff --git a/tests/test_keydb.py b/tests/test_keydb.py index a061feb2..50cb165a 100755 --- a/tests/test_keydb.py +++ b/tests/test_keydb.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_keydb.py @@ -11,7 +14,7 @@ October 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'keydb.py'. diff --git a/tests/test_log.py b/tests/test_log.py index a425facd..708d9def 100755 --- a/tests/test_log.py +++ b/tests/test_log.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_log.py @@ -11,7 +14,7 @@ May 1, 2014. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'log.py'. diff --git a/tests/test_mirrors.py b/tests/test_mirrors.py index f2e7f1e5..cda70971 100755 --- a/tests/test_mirrors.py +++ b/tests/test_mirrors.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_mirrors.py @@ -11,7 +14,7 @@ March 26, 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'mirrors.py'. diff --git a/tests/test_mix_and_match_attack.py b/tests/test_mix_and_match_attack.py index 845f473e..2cabb0c2 100755 --- a/tests/test_mix_and_match_attack.py +++ b/tests/test_mix_and_match_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_mix_and_match_attack.py @@ -17,7 +20,7 @@ simulated for the mix-and-match attack. -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate a mix-and-match attack. In a mix-and-match attack, an attacker is diff --git a/tests/test_multiple_repositories_integration.py b/tests/test_multiple_repositories_integration.py index 6d448864..bddd6254 100755 --- a/tests/test_multiple_repositories_integration.py +++ b/tests/test_multiple_repositories_integration.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_multiple_repositories_integration.py @@ -11,7 +14,7 @@ February 2, 2017 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Verify that clients are able to keep track of multiple repositories and diff --git a/tests/test_replay_attack.py b/tests/test_replay_attack.py index 30866ade..05d4c268 100755 --- a/tests/test_replay_attack.py +++ b/tests/test_replay_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_replay_attack.py @@ -17,10 +20,10 @@ -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. - Simulate a replay, or rollback, attack. In a replay attack, a client is + Simulate a replay, or rollback, attack. In a replay attack, a client is tricked into installing software that is older than that which the client previously knew to be available. diff --git a/tests/test_repository_lib.py b/tests/test_repository_lib.py index 624af103..51ae1f27 100755 --- a/tests/test_repository_lib.py +++ b/tests/test_repository_lib.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_repository_lib.py @@ -11,7 +14,7 @@ June 1, 2014. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'repository_lib.py'. diff --git a/tests/test_repository_tool.py b/tests/test_repository_tool.py index f1294cab..6930258f 100755 --- a/tests/test_repository_tool.py +++ b/tests/test_repository_tool.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_repository_tool.py @@ -11,7 +14,7 @@ April 7, 2014. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'repository_tool.py'. diff --git a/tests/test_roledb.py b/tests/test_roledb.py index bb0d09e8..d4ce8c2d 100755 --- a/tests/test_roledb.py +++ b/tests/test_roledb.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_roledb.py @@ -11,7 +14,7 @@ October 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Unit test for 'roledb.py'. diff --git a/tests/test_root_versioning_integration.py b/tests/test_root_versioning_integration.py index 25b2200e..fb02fa16 100755 --- a/tests/test_root_versioning_integration.py +++ b/tests/test_root_versioning_integration.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2016 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_root_versioning_integration.py @@ -11,7 +14,7 @@ July 21, 2016. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Test root versioning for efficient root key rotation. diff --git a/tests/test_sig.py b/tests/test_sig.py index c68a4de6..e83dc226 100755 --- a/tests/test_sig.py +++ b/tests/test_sig.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_sig.py @@ -12,7 +15,7 @@ February 28, 2012. Based on a previous version of this module. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Test cases for for sig.py. diff --git a/tests/test_slow_retrieval_attack.py b/tests/test_slow_retrieval_attack.py index 4779185e..4cc9abff 100755 --- a/tests/test_slow_retrieval_attack.py +++ b/tests/test_slow_retrieval_attack.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_slow_retrieval_attack.py @@ -17,7 +20,7 @@ previous setup. -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Simulate a slow retrieval attack, where an attacker is able to prevent clients diff --git a/tests/test_unittest_toolbox.py b/tests/test_unittest_toolbox.py index 18b39b3a..3831e788 100755 --- a/tests/test_unittest_toolbox.py +++ b/tests/test_unittest_toolbox.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_unittest_toolbox.py @@ -11,7 +14,7 @@ July 14, 2017. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Test cases for unittest_toolbox.py. diff --git a/tests/test_updater.py b/tests/test_updater.py index 8e97031e..d72cfa6b 100644 --- a/tests/test_updater.py +++ b/tests/test_updater.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_updater.py @@ -15,7 +18,7 @@ exact repositories, and add realistic retrieval of files. -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. 'test_updater.py' provides a collection of methods that test the public / diff --git a/tests/test_updater_root_rotation_integration.py b/tests/test_updater_root_rotation_integration.py index 2e2c8dc5..32a1e0ca 100755 --- a/tests/test_updater_root_rotation_integration.py +++ b/tests/test_updater_root_rotation_integration.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2016 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ test_updater_root_rotation_integration.py @@ -11,7 +14,7 @@ August 8, 2016. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. 'test_updater_root_rotation.py' provides a collection of methods that test diff --git a/tuf/__init__.py b/tuf/__init__.py index af80bbdd..e69de29b 100755 --- a/tuf/__init__.py +++ b/tuf/__init__.py @@ -1,2 +0,0 @@ -import os -os.environ['SIMPLE_SETTINGS'] = "tuf.settings" diff --git a/tuf/client/updater.py b/tuf/client/updater.py index 1bbabc86..295b64a3 100755 --- a/tuf/client/updater.py +++ b/tuf/client/updater.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ updater.py @@ -10,7 +15,7 @@ July 2012. Based on a previous version of this module. (VLAD) - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. 'updater.py' is intended to be the only TUF module that software update diff --git a/tuf/developer_tool.py b/tuf/developer_tool.py index f929f6bd..322215a5 100755 --- a/tuf/developer_tool.py +++ b/tuf/developer_tool.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ developer_tool.py @@ -14,7 +17,7 @@ January 22, 2014. - See LICENSE for licensing information. + See LICENCE-MIT.txt OR LICENCE-APACHE.txt for licensing information. See 'tuf/README-developer-tools.md' for a complete guide on using diff --git a/tuf/download.py b/tuf/download.py index a6314e18..56816be4 100755 --- a/tuf/download.py +++ b/tuf/download.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ download.py @@ -10,7 +15,7 @@ Vladimir Diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Download metadata and target files and check their validity. The hash and diff --git a/tuf/exceptions.py b/tuf/exceptions.py index f9db7687..2fb28ff1 100755 --- a/tuf/exceptions.py +++ b/tuf/exceptions.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ exceptions.py @@ -9,7 +14,7 @@ January 10, 2017 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Define TUF Exceptions. diff --git a/tuf/formats.py b/tuf/formats.py index 4640e73f..329a5916 100755 --- a/tuf/formats.py +++ b/tuf/formats.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ formats.py @@ -12,7 +15,7 @@ Refactored April 30, 2012. -vladimir.v.diaz - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. A central location for all format-related checking of TUF objects. diff --git a/tuf/keydb.py b/tuf/keydb.py index ac6ad7e6..4e918b83 100755 --- a/tuf/keydb.py +++ b/tuf/keydb.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ keydb.py @@ -9,7 +14,7 @@ March 21, 2012. Based on a previous version of this module by Geremy Condra. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Represent a collection of keys and their organization. This module ensures diff --git a/tuf/log.py b/tuf/log.py index 7ce00937..fb3e6777 100755 --- a/tuf/log.py +++ b/tuf/log.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ log.py @@ -9,7 +14,7 @@ April 4, 2012. Based on a previous version of this module by Geremy Condra. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. A central location for all logging-related configuration. This module should diff --git a/tuf/mirrors.py b/tuf/mirrors.py index 3c441185..29df2122 100755 --- a/tuf/mirrors.py +++ b/tuf/mirrors.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ mirrors.py @@ -10,7 +15,7 @@ March 12, 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Extract a list of mirror urls corresponding to the file type and the location diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index d4d3d09b..875d35ee 100755 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2014 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ repository_lib.py @@ -11,7 +14,7 @@ June 1, 2014. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provide a library for the repository tool that can create a TUF repository. diff --git a/tuf/repository_tool.py b/tuf/repository_tool.py index e137fa22..851bb203 100755 --- a/tuf/repository_tool.py +++ b/tuf/repository_tool.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2013 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ repository_tool.py @@ -11,7 +14,7 @@ October 19, 2013 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provide a tool that can create a TUF repository. It can be used with the diff --git a/tuf/roledb.py b/tuf/roledb.py index 6bfc9415..987e6c1a 100755 --- a/tuf/roledb.py +++ b/tuf/roledb.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ roledb.py @@ -9,7 +14,7 @@ March 21, 2012. Based on a previous version of this module by Geremy Condra. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Represent a collection of roles and their organization. The caller may diff --git a/tuf/scripts/basic_client.py b/tuf/scripts/basic_client.py index 77781b9f..dee20c8f 100755 --- a/tuf/scripts/basic_client.py +++ b/tuf/scripts/basic_client.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ basic_client.py @@ -11,7 +14,7 @@ September 2012 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provide a basic TUF client that can update all of the metatada and target diff --git a/tuf/settings.py b/tuf/settings.py index a545d95d..1989eed5 100755 --- a/tuf/settings.py +++ b/tuf/settings.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +# Copyright 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ settings.py @@ -11,7 +14,7 @@ January 11, 2017 - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. A central location for TUF configuration settings. Example options include diff --git a/tuf/sig.py b/tuf/sig.py index a5cbf78f..26a14f4d 100755 --- a/tuf/sig.py +++ b/tuf/sig.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ sig.py @@ -9,7 +14,7 @@ February 28, 2012. Based on a previous version by Geremy Condra. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Survivable key compromise is one feature of a secure update system diff --git a/tuf/unittest_toolbox.py b/tuf/unittest_toolbox.py index 34ee259c..235628fd 100755 --- a/tuf/unittest_toolbox.py +++ b/tuf/unittest_toolbox.py @@ -1,3 +1,8 @@ +#!/usr/bin/env python + +# Copyright 2012 - 2017, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ unittest_toolbox.py @@ -9,7 +14,7 @@ March 26, 2012. - See LICENSE for licensing information. + See LICENSE-MIT.txt OR LICENSE-APACHE.txt for licensing information. Provides an array of various methods for unit testing. Use it instead of