diff --git a/dev-requirements.txt b/dev-requirements.txt index 1922ad28d8..8c736e02e2 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -19,7 +19,7 @@ cffi==1.7.0 pycrypto==2.6.1 pynacl==1.0.1 cryptography==1.4.0 -securesystemslib==0.10.6 +securesystemslib==0.10.7 # Testing requirements. The rest of the testing dependencies available in # 'tox.ini' diff --git a/setup.py b/setup.py index 6a926834c4..4be0a2e6b5 100755 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ 'Topic :: Security', 'Topic :: Software Development' ], - install_requires = ['iso8601', 'six', 'securesystemslib>=0.10.6'], + install_requires = ['iso8601', 'six', 'securesystemslib>=0.10.7'], packages = find_packages(exclude=['tests']), scripts = [ 'tuf/scripts/basic_client.py', diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json b/tests/repository_data/client/test_repository/metadata/current/1.root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/client/test_repository/metadata/current/1.root.json +++ b/tests/repository_data/client/test_repository/metadata/current/1.root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz index c0f73a1757..5d5913af0a 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz and b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json b/tests/repository_data/client/test_repository/metadata/current/role1.json index 45e4a14eff..e664618afd 100644 --- a/tests/repository_data/client/test_repository/metadata/current/role1.json +++ b/tests/repository_data/client/test_repository/metadata/current/role1.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "e10b2dd543312f298469336b05aef7f86c1314b654056b5b4e0345ec232275cff73d87ea33879d6af41989b2b6d633b8e675ec1b781572cbdff9389aaa461a0c" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "f747fdca082875e7f93cf269151a3f40a6ffdb62b4c772ccd0318ccacbded000c6cccc538b57cf8b1644f6de377b1fdf124ff8747d732e30cd2f4afd3251b00c" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role2", "paths": [], diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz index 07ddf08330..4b9ff54595 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json b/tests/repository_data/client/test_repository/metadata/current/role2.json index 22fbfccc2b..871be73aa2 100644 --- a/tests/repository_data/client/test_repository/metadata/current/role2.json +++ b/tests/repository_data/client/test_repository/metadata/current/role2.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "734aee753376027d41abbfa5540a2e4c25a65c0c487698e59527dd93ad5e14847619738c4bfb68c5eff55045e8bddc430c6c89680a1a7aee42d11bdf3c8ef900" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "38a8a494cfdfd4cb855b89e8b119a44545dac3fb65153231c5338656c6c8c21effb2cd6292578a6ecd7374a0aed9051ce1e8c5ac2a6be90de900f1708bbb910f" } ], "signed": { diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz index fa2c4407fd..6be24b7870 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json b/tests/repository_data/client/test_repository/metadata/current/root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/client/test_repository/metadata/current/root.json +++ b/tests/repository_data/client/test_repository/metadata/current/root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json.gz b/tests/repository_data/client/test_repository/metadata/current/root.json.gz deleted file mode 100644 index 2df907ec03..0000000000 Binary files a/tests/repository_data/client/test_repository/metadata/current/root.json.gz and /dev/null differ diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json b/tests/repository_data/client/test_repository/metadata/current/snapshot.json index db769f809f..bd124f5045 100644 --- a/tests/repository_data/client/test_repository/metadata/current/snapshot.json +++ b/tests/repository_data/client/test_repository/metadata/current/snapshot.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9", - "method": "ed25519", - "sig": "6eca4489663994600fe909355d040e23e69acb9f13b53773d29e4eec2f7238e8534d65999d7060e7c701c8fe3129f092e98b2574554ccda9f0158d47988cae03" + "keyid": "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d", + "sig": "14fa7b8082bcde5e2dca5bb2d939847c938685577c172e14d66cc9f67f3aa2925fdefacc995d52e9fc8e4961f555049f89afa7645d884d07c44d5cb1d59deb0d" } ], "signed": { diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz index 32e95b7ee7..b482985be0 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json b/tests/repository_data/client/test_repository/metadata/current/targets.json index 316679fef2..ee0cc59830 100644 --- a/tests/repository_data/client/test_repository/metadata/current/targets.json +++ b/tests/repository_data/client/test_repository/metadata/current/targets.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b", - "method": "ed25519", - "sig": "14f6e6566ec13c3089d4f266a248aa8948edcff1826d23cba88ba4d6c598df9127c017f0cdc580f5057ddda876a061dd5830a9e130aee15a530f917949fe4509" + "keyid": "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093", + "sig": "1aef441a6270ee834ddbc951c456d18c14971aa0f81b18f89da87e1fb6d3ec514c274c6d44d7d1be33ec08010f60d822640c43b7cca1da594709023443a9ff02" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role1", "paths": [ diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz index a0af09d039..0f54614b8d 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json b/tests/repository_data/client/test_repository/metadata/current/timestamp.json index 6262a5c2ce..5d3a3dbe0e 100644 --- a/tests/repository_data/client/test_repository/metadata/current/timestamp.json +++ b/tests/repository_data/client/test_repository/metadata/current/timestamp.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1", - "method": "ed25519", - "sig": "33ceb7fb3a54078e80ffc00bbdb291689de76d55d3da1a9ed13bee01c292c1172db8c203828e52cdc2f4e38b69da25662f3368f8c863be8d24a96b9b841d2a00" + "keyid": "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758", + "sig": "52d6c8d7a00682730a8923a95a865bd44135929236136b180c40de47783165b91f53e86c6f98b3ee136b8b84dc1c862304295ed3d1fe6a7cba52b7d1e1b5df0b" } ], "signed": { @@ -12,9 +11,9 @@ "meta": { "snapshot.json": { "hashes": { - "sha256": "62f2166c6e423e9b861106a63d67929ef8cd1ea015e3f2b147baee7b4530a91c" + "sha256": "eb30508426dc4bb14df321740e94d9c1e17daa942e7fc9c532f38aff6a05f716" }, - "length": 553, + "length": 529, "version": 1 } }, diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz index 5842a0bfed..c5ce051f8b 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json b/tests/repository_data/client/test_repository/metadata/previous/1.root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/1.root.json +++ b/tests/repository_data/client/test_repository/metadata/previous/1.root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz deleted file mode 100644 index c0f73a1757..0000000000 Binary files a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz and /dev/null differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json b/tests/repository_data/client/test_repository/metadata/previous/role1.json index 45e4a14eff..e664618afd 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/role1.json +++ b/tests/repository_data/client/test_repository/metadata/previous/role1.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "e10b2dd543312f298469336b05aef7f86c1314b654056b5b4e0345ec232275cff73d87ea33879d6af41989b2b6d633b8e675ec1b781572cbdff9389aaa461a0c" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "f747fdca082875e7f93cf269151a3f40a6ffdb62b4c772ccd0318ccacbded000c6cccc538b57cf8b1644f6de377b1fdf124ff8747d732e30cd2f4afd3251b00c" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role2", "paths": [], diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz index 07ddf08330..4b9ff54595 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json b/tests/repository_data/client/test_repository/metadata/previous/role2.json index 22fbfccc2b..871be73aa2 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/role2.json +++ b/tests/repository_data/client/test_repository/metadata/previous/role2.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "734aee753376027d41abbfa5540a2e4c25a65c0c487698e59527dd93ad5e14847619738c4bfb68c5eff55045e8bddc430c6c89680a1a7aee42d11bdf3c8ef900" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "38a8a494cfdfd4cb855b89e8b119a44545dac3fb65153231c5338656c6c8c21effb2cd6292578a6ecd7374a0aed9051ce1e8c5ac2a6be90de900f1708bbb910f" } ], "signed": { diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz index fa2c4407fd..6be24b7870 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/root.json b/tests/repository_data/client/test_repository/metadata/previous/root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/root.json +++ b/tests/repository_data/client/test_repository/metadata/previous/root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json index db769f809f..bd124f5045 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json +++ b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9", - "method": "ed25519", - "sig": "6eca4489663994600fe909355d040e23e69acb9f13b53773d29e4eec2f7238e8534d65999d7060e7c701c8fe3129f092e98b2574554ccda9f0158d47988cae03" + "keyid": "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d", + "sig": "14fa7b8082bcde5e2dca5bb2d939847c938685577c172e14d66cc9f67f3aa2925fdefacc995d52e9fc8e4961f555049f89afa7645d884d07c44d5cb1d59deb0d" } ], "signed": { diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz index 32e95b7ee7..b482985be0 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json b/tests/repository_data/client/test_repository/metadata/previous/targets.json index 316679fef2..ee0cc59830 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/targets.json +++ b/tests/repository_data/client/test_repository/metadata/previous/targets.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b", - "method": "ed25519", - "sig": "14f6e6566ec13c3089d4f266a248aa8948edcff1826d23cba88ba4d6c598df9127c017f0cdc580f5057ddda876a061dd5830a9e130aee15a530f917949fe4509" + "keyid": "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093", + "sig": "1aef441a6270ee834ddbc951c456d18c14971aa0f81b18f89da87e1fb6d3ec514c274c6d44d7d1be33ec08010f60d822640c43b7cca1da594709023443a9ff02" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role1", "paths": [ diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz index a0af09d039..0f54614b8d 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json index 6262a5c2ce..5d3a3dbe0e 100644 --- a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json +++ b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1", - "method": "ed25519", - "sig": "33ceb7fb3a54078e80ffc00bbdb291689de76d55d3da1a9ed13bee01c292c1172db8c203828e52cdc2f4e38b69da25662f3368f8c863be8d24a96b9b841d2a00" + "keyid": "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758", + "sig": "52d6c8d7a00682730a8923a95a865bd44135929236136b180c40de47783165b91f53e86c6f98b3ee136b8b84dc1c862304295ed3d1fe6a7cba52b7d1e1b5df0b" } ], "signed": { @@ -12,9 +11,9 @@ "meta": { "snapshot.json": { "hashes": { - "sha256": "62f2166c6e423e9b861106a63d67929ef8cd1ea015e3f2b147baee7b4530a91c" + "sha256": "eb30508426dc4bb14df321740e94d9c1e17daa942e7fc9c532f38aff6a05f716" }, - "length": 553, + "length": 529, "version": 1 } }, diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz index 5842a0bfed..c5ce051f8b 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz differ diff --git a/tests/repository_data/keystore/delegation_key b/tests/repository_data/keystore/delegation_key index 9656a6fb3b..461169d63c 100644 --- a/tests/repository_data/keystore/delegation_key +++ b/tests/repository_data/keystore/delegation_key @@ -1 +1 @@ -f027d1bf6ee9918c9d7af5f5957c5755@@@@100000@@@@7b8556aa892f5ca3fe5473355c1f8f419ae86017d65176e8b818d70d06beda58@@@@512b9499b34212d1c49dc612734858d9@@@@613469c7b1ab4f0643074560d955cb33209981bbb2e26e4dc4da7727a9963e76e623182f9e6f189e7f02d5feb52910b797c1c32fedce5396012870c402ce2dfaed05ab373ca693472672f28ecd39644ccfdb9c44857385a5e67ab447c91ad8efc037f290d92921dc41acf5dd350326f5c58108fc8c64e290c8244dbbd69a93ef32f6dd109f065a9a080b913d6cd2333262a8866509dd2b93181f305be4a633747a4c9a73d19dd83eb198463694a1560f773ebb586e2147790b4ecf6b60db8132537ee206ba7286d2a385f82ea0a620e744e6a24d807c93a0a133bf70c573d6ac1a54ef37db24b243c775e45cf61d6ed1268777b316939ea91379ea370d1ad2ee14cee5188f1f2e121dbac6fd \ No newline at end of file +68593a508472ad3007915379e6b1f3c0@@@@100000@@@@615986af4d1ba89aeadc2f489f89b0e8d46da133a6f75c7b162b8f99f63f86ed@@@@8319255f9856c4f40f9d71bc10e79e5d@@@@1dc7b20f1c668a1f544dc39c7a9fcb3c4a4dd34d1cc8c9d8f779bab026cf0b8e0f46e53bc5ed20bf0e5048b94a5d2ea176e79c12bcc7daa65cd55bf810deebeec5bc903ce9e5316d7dbba88f1a2b51d3f9bc782f8fa9b21dff91609ad0260e21a2039223f816d0fe97ace2e204d0025d327b38d27aa6cd87e85aa8883bfcb6d12f93155d72ffd3c7717a0570cf9811eb6d6a340baa0f27433315d83322c685fec02053ff8c173c4ebf91a258e83402f39546821e3352baa7b246e33b2a573a8ff7b289682407abbcb9184249d4304db68d3bf8e124e94377fd62dde5c4f3b7617d483776345154d047d139b1e559351577da315f54e16153c510159e1908231574bcf49c4f96cafe6530e86a09e9eee47bcff78f2fed2984754c895733938999ff085f9e3532d7174fd76dc09921506dd2137e16ec4926998f5d9df8a8ffb3e6649c71bc32571b2e24357739fa1a56be \ No newline at end of file diff --git a/tests/repository_data/keystore/delegation_key.pub b/tests/repository_data/keystore/delegation_key.pub index 1536e82011..d600bffbfa 100644 --- a/tests/repository_data/keystore/delegation_key.pub +++ b/tests/repository_data/keystore/delegation_key.pub @@ -1 +1 @@ -{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a"}} \ No newline at end of file +{"keyval": {"public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]} \ No newline at end of file diff --git a/tests/repository_data/keystore/root_key b/tests/repository_data/keystore/root_key index c54376920b..1b8fb14529 100644 --- a/tests/repository_data/keystore/root_key +++ b/tests/repository_data/keystore/root_key @@ -1,42 +1,42 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,6015A3049DBF1CD5 - -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 ------END RSA PRIVATE KEY----- \ No newline at end of file +-----BEGIN ENCRYPTED PRIVATE KEY----- +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 +-----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/repository_data/keystore/root_key.pub b/tests/repository_data/keystore/root_key.pub index a04eb42080..11cc245f38 100644 --- a/tests/repository_data/keystore/root_key.pub +++ b/tests/repository_data/keystore/root_key.pub @@ -1,11 +1,11 @@ -----BEGIN PUBLIC KEY----- -MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l -Vc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx -Jkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7 -MpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK -hI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2 -xx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c -pSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ -kMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE -AUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE= +MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe +PkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i +xmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity +fQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa +ndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc +MdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV +z94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y +R47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA +a82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE= -----END PUBLIC KEY----- diff --git a/tests/repository_data/keystore/snapshot_key b/tests/repository_data/keystore/snapshot_key index 9c0f3b3506..08c954fdd1 100644 --- a/tests/repository_data/keystore/snapshot_key +++ b/tests/repository_data/keystore/snapshot_key @@ -1 +1 @@ -481eac26df5b6688c775c03de82dffa1@@@@100000@@@@65c88dd37151f6d869cf4ecdd46ccc8269da3eb2d491a8b28622fdc71d324ffb@@@@cb3d36a32d0cd80485b045dc665b1089@@@@c3b3df6223832cb2879dcbab8904c369cfbd525aa27d9e2d60fd2da023c8b63a7a503baaaeb3511c5dcd941c872029df235e950bae85ab987d3e521ab4b2aaa3f12abbfacb81045f0e4584a98e474f9170690c26921ebd72df98cf5a9f656f3ace8e4f9be19019b0c9efc1077fd6e29d2d9b259257b5a2940fb85f90a7638090d3c4bafc98dd8db217137957a8a72a83c9fe751288decd537ad583bcd30154632c98c743988fe4bb47bfcda229445343d20ea8698679b78a1625f9b77cc86d4a2c47272d7ffb20b60ab403dac47fed3a863a74cec128231a70e3c71527e4f0a3761a878f90bbfd40eb31072be9f974284125a5e38ab5728d1dd29b9ee6c6f3133c18043f6ae3d5dfa2d0ec57 \ No newline at end of file +a87b80b8a0d39b919b9638181e7b274e@@@@100000@@@@132edd670981aaf1980673966266174d944d735eb5b0b7ec83ed97da5c212249@@@@bd08ae9898ac5f81fc14e418e9790f9b@@@@399250c9aad40035e0acff48db59697bc3cf33d55b52aa272246addeaaf318d931d3a72964f0c84eccf5b89279b8233685330ad884f7b39bf369553133b985f9396bd5e24cb8e343643923022565a645e188a1165e427aedc389cca821d6a93cb2d8d16cea8ffeb56469bcb9f2f66e03d581a2ea37da271980dd02b84717fe475e13a305b4ae714c11c94f6711c744bb291a146d7419474584bad4be152d0299273c1fad6cd95232a4bf07f39c16da7f4d13201a88fad822cb328008e8a2762baf974b5d5080451751fb8ef53a01ca734157be78b3eb13c6270e4e98b138c78388360e7f558389871b7a32b4d5572626b3112264a0b56dbbb1138c9765872a71dd4e7d31006c2e690f5ede608ce633ad94ebb7d1ddec1a7eac2168fc5d36efe590c4c2059c6f3bcf75ab63474eede3ce4fdc93c6564058b14a0fa9bf3cb6d58c53315b406409ee4aeb18abe072734df0 \ No newline at end of file diff --git a/tests/repository_data/keystore/snapshot_key.pub b/tests/repository_data/keystore/snapshot_key.pub index 9222aacf48..d08bb848c1 100644 --- a/tests/repository_data/keystore/snapshot_key.pub +++ b/tests/repository_data/keystore/snapshot_key.pub @@ -1 +1 @@ -{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8"}} \ No newline at end of file +{"keyval": {"public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]} \ No newline at end of file diff --git a/tests/repository_data/keystore/targets_key b/tests/repository_data/keystore/targets_key index 3f872f4ecf..c3883ec3c5 100644 --- a/tests/repository_data/keystore/targets_key +++ b/tests/repository_data/keystore/targets_key @@ -1 +1 @@ -1d4fbaef4715e89f94655857f0bac179@@@@100000@@@@5eab500ba01eab1dc380999f03bf6ef1d6ce8d5534e56278dc3c97cb48f6db0f@@@@2e5a0b1a8e05b61f0d78cb5ed2d2077f@@@@665ef8e0272749664c19df418c937d86c4ee9be94851762e622f6eb80c6694738baa397e597fc6761d2d5c24a1db98014c44d489a7348adea62d0e961234b32aa2ee4d69f400c909dbadf5b76d1e579ae7dd595856757e6da7fa310a218261fdb9efb867962a1ed19109015e7755c23f42ea819773df2779dccab2c1bad2cbfdb05ed4b38da1f58d780f937a47d66058f97ca5d8720a8312b4370ce4e75c8aba5ae864a239cc27645da216df331cee9f9a103d788c64de2e42c8630a9f54ef0ddc87327abc121de9d928147e3f8e12a94a2423cef569affc977677b263eb4c42506002d65edaa0b58cddc9075bb60dd0971bfa604d1e952b67a9fc78455693c134b50c34acb8d139a0fb49d0 \ No newline at end of file +a5a903322888df0bf8275b215f2044fe@@@@100000@@@@5f6b803652cb6d5bce4e07b1482597adb96d06c2efa3393abdcc0425f70be692@@@@0664811967e2f413927ce51a7f43a80e@@@@cf1dccd034400195c667c064198ef25555f3f94bf9cf77fbe300246618e557ad0efa775ef90bd46c842696c45d14033199860b2214c3641e87889a41171f8a2c763d004681b66b462ff34599e8d9da87f5642d2a015b75d3f601d198e0467fa4bc28f65c76260585e0cce71281f67a8053116f0f06883155f602811071b56bf75bf54daae5968b0a31cf829510f3c52c0eeb8f1c6bb8b8cb0c3edb4c6c2dd9d13bee00c5d63c3f98e0904eebb609864f4ab4fcc2c17bba8fd36aa06bc96bc1922eb10557051a674acf2cb01ff3efb7d55411df6915bbc49a095ff4472dc441e2765244f801d0df07b754c952d039f39b4530930a14be42cb2041f22eeb306b12f12158fcd2beb033db1be21f5a6ab72335cf16dfbd19cbf39c00b0a571d2b0e25df032be53a49a7a70ecebebb441d327c638cf31804381afaf809cd1c75f9070e83240fbaaa87bea0799404ece788862 \ No newline at end of file diff --git a/tests/repository_data/keystore/targets_key.pub b/tests/repository_data/keystore/targets_key.pub index 7ac5726afd..e859eb228e 100644 --- a/tests/repository_data/keystore/targets_key.pub +++ b/tests/repository_data/keystore/targets_key.pub @@ -1 +1 @@ -{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2"}} \ No newline at end of file +{"keyval": {"public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]} \ No newline at end of file diff --git a/tests/repository_data/keystore/timestamp_key b/tests/repository_data/keystore/timestamp_key index 0e6786137e..ca82579003 100644 --- a/tests/repository_data/keystore/timestamp_key +++ b/tests/repository_data/keystore/timestamp_key @@ -1 +1 @@ -371c9b3b39a3c35ca0968d045ce58d1d@@@@100000@@@@975c02c936e651682f3b80f8d782411192ed17eb3e32de148cf13ea679c705d8@@@@ee4467b6250c9f88cdd4952d891e4681@@@@83336db56e4e30f481194e319c6b89de25bf795a57b27f8b060405881c79cdc4cfaa8acf886a4ba017e4bf78e78285b7ba67bf974e38d1e733961c49bc6bad1076c85bed527b468039f7980783caf0dcf32093ad96fe2fd56cf149dd7608bc582b0732a408e63085cdca59e2044ed688e7ae22883eefff48578c42c413d9ad4eed0f22758ce540c87b24365e906ddb1ffb628de5c97717fab73710c0f9425054bc31563ea217ef07e6d01b7e67a8d22ba4f30a0c1969317cca46bccc3c80ad9c085d52260e62d31f13c5a3192a4065529056211a634d5b21ad1386d5ddd9756c24c1c55ed7f63f84367b6072a919312c3e2ccca595aea64746b0f9dbe0ef6548090d17a2ad128bbf7bf1e756 \ No newline at end of file +677a42cd6c1df08d0c6156ae356c2875@@@@100000@@@@3850dbcf2973b80044912d630f05039df64775b63d1cf43e750d3cd8a457c64f@@@@bf01961c386d9fefb4b29db7f6ef0c7f@@@@96d37abafb902f821134d2034855d23b78c82e5b768b092fcf0d3b6b28a74734877a5014b26e5fed289d24f7cf6b393445c3231554c5b6d9711192cf9bd2fb7490497d7d76c619a0cfc70abae026b5068fb66db0138b04f890917daad66ca1f7baabdcbb5282e46a2f1c6ff2e8c241ff16ef31e918ca1387a15bc2ceadb2f75ce68fcff08186b5b901a499efe1f674319b503ff8b6fc004b71d0ecb94253f38c58349ab749e72f492e541e7504d25a0bfe791f53eb95c4524431b0f952fc3d7c7204a2a4aab44d33fe09cb36b337339e2a004bf15dfd925b63930905972749441a0c6e50ec9b1748a4cfbacf10b402ebd9c0074fcb38d236fd3146f60232862b0501e8e6caa9f81c223de03ba7b25a1d4bc2d031901dc445f25ce302d2189b8b8de443bc6f562f941b55595655193ab6b84c1ec2302ca056c70e8efb1cad909c50e82e0b7da9ad64202d149e4e837409 \ No newline at end of file diff --git a/tests/repository_data/keystore/timestamp_key.pub b/tests/repository_data/keystore/timestamp_key.pub index c111a80650..69ba7ded1d 100644 --- a/tests/repository_data/keystore/timestamp_key.pub +++ b/tests/repository_data/keystore/timestamp_key.pub @@ -1 +1 @@ -{"keytype": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c"}} \ No newline at end of file +{"keyval": {"public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4"}, "keytype": "ed25519", "scheme": "ed25519", "keyid_hash_algorithms": ["sha256", "sha512"]} \ No newline at end of file diff --git a/tests/repository_data/project/test-flat/project.cfg b/tests/repository_data/project/test-flat/project.cfg index 365a07b5fd..1564431d80 100644 --- a/tests/repository_data/project/test-flat/project.cfg +++ b/tests/repository_data/project/test-flat/project.cfg @@ -1 +1 @@ -{"project_name": "test-flat", "targets_location": "/Users/vlad/projects/vladforks/tuf/tests/repository_data/project/targets", "prefix": "prefix", "metadata_location": "test-flat", "threshold": 1, "public_keys": {"5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": {"keytype": "rsa", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----"}}}, "layout_type": "flat"} \ No newline at end of file +{"project_name": "test-flat", "targets_location": "/Users/vlad/projects/vladforks/tuf/tests/repository_data/project/targets", "prefix": "prefix", "metadata_location": "test-flat", "threshold": 1, "public_keys": {"4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": {"keyval": {"public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----"}, "keytype": "rsa", "scheme": "rsassa-pss-sha256", "keyid_hash_algorithms": ["sha256", "sha512"]}}, "layout_type": "flat"} \ No newline at end of file diff --git a/tests/repository_data/project/test-flat/role1.json b/tests/repository_data/project/test-flat/role1.json index 535d3f90bc..6ba90f89cd 100644 --- a/tests/repository_data/project/test-flat/role1.json +++ b/tests/repository_data/project/test-flat/role1.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "c074865e492079d212dca65c96fab54f6bfe765b536c8c3382ed278698e997cf9ccc4ba76c0b36872eea280fd3fa19bdafa891f7f2dc5a7d63a240ea9d99e507" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "28415cbd06dae20a8a96e1ca8c2b03529b72d95499fd922f424d21020c38e89425f2d7c07da71b8d8f8ea97b1cb0af59145bc573c8e9b24fd96a3c26c05e500e" } ], "signed": { diff --git a/tests/repository_data/project/test-flat/test-flat.json b/tests/repository_data/project/test-flat/test-flat.json index 7e90d071ba..85da4f75d3 100644 --- a/tests/repository_data/project/test-flat/test-flat.json +++ b/tests/repository_data/project/test-flat/test-flat.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "0d708d804e8181fea6dc0c4449e319e8a33f8dd83ad569d7d1d87fb094fbcf2816ae492250f3250a8b69b996e9f1b239dc1ba827cf3346df4c31e697a8f4e0d6ea86645d7d43ee867f8a8b5da8a997a12289d277051a1f25b1d7571978801cb1cb2c0b21b12052b3eb9590301bf2b5ecb3a95a447cf5e11be263160b62eec419754e2bdc51b24e57885caa55317ee1d929a90edab7793c3e5e0ae230db306aa8001ae49452b8f988b34ac33e64aaf07cca8c20edb2e5c580217705fa19e03cb8ea1f4ff79ba23b97f59e6a8cfbe7c57f43d0c3ab2ab11b9cf502a9df3c3af3e7f743dd0d827082a92076deac8a3b07d7903c9018259f62889ce56ef34c338f0a4ce9233a7aaa3128ed5901fe0bc445b3433c9bf3010564fdf0b9b29b901b354ae88015b60d2912b7362937c5ba7a289bc7a216b898c04994cbd643735e3fa9ec6f845fe34fefa85a8e5460b530b26e84a737f618b8b4f596a679a092fd97a72b9d4473133f06ac52ce13c9ebf792e077a2834a70fd54edba72fd493fce75a30a" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "7fe5614c3254a80f324948679a0148b750eb4f80a504fdaade219951df2ed6c20d052ef79d96cab3c8cec38e20783c9e7134508b67e1dd81bb1c72f84912452cd4207869926256ba71ccf7c23bb2ab9482d0ac7886298ecff0853400692cf9933939ec972168fbd103727172ac3a95dba97540c6bb93aac2616562a87a7ea4cbcbde78da9b2d5b13a98fda7bb3ab63395cc588967e1a347cf8ddd0d06415d7a66deffa0078a01e08e1c758bbe556f906e50b0a8e9dd17e32cae9ce82909cf3cd3595ab89ba9ce592fe591c34df9c58adf66e2838853a115b2b8878a9a8c4c21d6c3f4358c2cf08e14b5476cb3ab4a08c426aaa2f91dea29d607e6563611eafca49ec6fee1de7bc47575a5f77773ed1c71e5c02ef8abbe571e1c08cf8aee03d492beacb242719512a4b0dbbe7e7b5829570472e380113c667930dc606d0959338f0de4d92ea2dba09231bf90dec77defb8d3b9e701d0300117d3cd89eb99e41be131adc806ae6e77d4da4a8d44aa3613492a9e4a3ed18804e86f2d8c89f1d4c69" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role1", "paths": [ diff --git a/tests/repository_data/project/test-flat/test-flat.json.gz b/tests/repository_data/project/test-flat/test-flat.json.gz index fc67c339a6..48fd264d67 100644 Binary files a/tests/repository_data/project/test-flat/test-flat.json.gz and b/tests/repository_data/project/test-flat/test-flat.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/1.root.json b/tests/repository_data/repository/metadata.staged/1.root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/repository/metadata.staged/1.root.json +++ b/tests/repository_data/repository/metadata.staged/1.root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/repository/metadata.staged/1.root.json.gz b/tests/repository_data/repository/metadata.staged/1.root.json.gz index c0f73a1757..5d5913af0a 100644 Binary files a/tests/repository_data/repository/metadata.staged/1.root.json.gz and b/tests/repository_data/repository/metadata.staged/1.root.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/role1.json b/tests/repository_data/repository/metadata.staged/role1.json index 45e4a14eff..e664618afd 100644 --- a/tests/repository_data/repository/metadata.staged/role1.json +++ b/tests/repository_data/repository/metadata.staged/role1.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "e10b2dd543312f298469336b05aef7f86c1314b654056b5b4e0345ec232275cff73d87ea33879d6af41989b2b6d633b8e675ec1b781572cbdff9389aaa461a0c" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "f747fdca082875e7f93cf269151a3f40a6ffdb62b4c772ccd0318ccacbded000c6cccc538b57cf8b1644f6de377b1fdf124ff8747d732e30cd2f4afd3251b00c" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role2", "paths": [], diff --git a/tests/repository_data/repository/metadata.staged/role1.json.gz b/tests/repository_data/repository/metadata.staged/role1.json.gz index 07ddf08330..4b9ff54595 100644 Binary files a/tests/repository_data/repository/metadata.staged/role1.json.gz and b/tests/repository_data/repository/metadata.staged/role1.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/role2.json b/tests/repository_data/repository/metadata.staged/role2.json index 22fbfccc2b..871be73aa2 100644 --- a/tests/repository_data/repository/metadata.staged/role2.json +++ b/tests/repository_data/repository/metadata.staged/role2.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "734aee753376027d41abbfa5540a2e4c25a65c0c487698e59527dd93ad5e14847619738c4bfb68c5eff55045e8bddc430c6c89680a1a7aee42d11bdf3c8ef900" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "38a8a494cfdfd4cb855b89e8b119a44545dac3fb65153231c5338656c6c8c21effb2cd6292578a6ecd7374a0aed9051ce1e8c5ac2a6be90de900f1708bbb910f" } ], "signed": { diff --git a/tests/repository_data/repository/metadata.staged/role2.json.gz b/tests/repository_data/repository/metadata.staged/role2.json.gz index fa2c4407fd..6be24b7870 100644 Binary files a/tests/repository_data/repository/metadata.staged/role2.json.gz and b/tests/repository_data/repository/metadata.staged/role2.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/repository/metadata.staged/root.json +++ b/tests/repository_data/repository/metadata.staged/root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json index db769f809f..bd124f5045 100644 --- a/tests/repository_data/repository/metadata.staged/snapshot.json +++ b/tests/repository_data/repository/metadata.staged/snapshot.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9", - "method": "ed25519", - "sig": "6eca4489663994600fe909355d040e23e69acb9f13b53773d29e4eec2f7238e8534d65999d7060e7c701c8fe3129f092e98b2574554ccda9f0158d47988cae03" + "keyid": "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d", + "sig": "14fa7b8082bcde5e2dca5bb2d939847c938685577c172e14d66cc9f67f3aa2925fdefacc995d52e9fc8e4961f555049f89afa7645d884d07c44d5cb1d59deb0d" } ], "signed": { diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json.gz b/tests/repository_data/repository/metadata.staged/snapshot.json.gz index 32e95b7ee7..b482985be0 100644 Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json.gz and b/tests/repository_data/repository/metadata.staged/snapshot.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/targets.json b/tests/repository_data/repository/metadata.staged/targets.json index 316679fef2..ee0cc59830 100644 --- a/tests/repository_data/repository/metadata.staged/targets.json +++ b/tests/repository_data/repository/metadata.staged/targets.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b", - "method": "ed25519", - "sig": "14f6e6566ec13c3089d4f266a248aa8948edcff1826d23cba88ba4d6c598df9127c017f0cdc580f5057ddda876a061dd5830a9e130aee15a530f917949fe4509" + "keyid": "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093", + "sig": "1aef441a6270ee834ddbc951c456d18c14971aa0f81b18f89da87e1fb6d3ec514c274c6d44d7d1be33ec08010f60d822640c43b7cca1da594709023443a9ff02" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role1", "paths": [ diff --git a/tests/repository_data/repository/metadata.staged/targets.json.gz b/tests/repository_data/repository/metadata.staged/targets.json.gz index a0af09d039..0f54614b8d 100644 Binary files a/tests/repository_data/repository/metadata.staged/targets.json.gz and b/tests/repository_data/repository/metadata.staged/targets.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json index 6262a5c2ce..5d3a3dbe0e 100644 --- a/tests/repository_data/repository/metadata.staged/timestamp.json +++ b/tests/repository_data/repository/metadata.staged/timestamp.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1", - "method": "ed25519", - "sig": "33ceb7fb3a54078e80ffc00bbdb291689de76d55d3da1a9ed13bee01c292c1172db8c203828e52cdc2f4e38b69da25662f3368f8c863be8d24a96b9b841d2a00" + "keyid": "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758", + "sig": "52d6c8d7a00682730a8923a95a865bd44135929236136b180c40de47783165b91f53e86c6f98b3ee136b8b84dc1c862304295ed3d1fe6a7cba52b7d1e1b5df0b" } ], "signed": { @@ -12,9 +11,9 @@ "meta": { "snapshot.json": { "hashes": { - "sha256": "62f2166c6e423e9b861106a63d67929ef8cd1ea015e3f2b147baee7b4530a91c" + "sha256": "eb30508426dc4bb14df321740e94d9c1e17daa942e7fc9c532f38aff6a05f716" }, - "length": 553, + "length": 529, "version": 1 } }, diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json.gz b/tests/repository_data/repository/metadata.staged/timestamp.json.gz index 5842a0bfed..c5ce051f8b 100644 Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json.gz and b/tests/repository_data/repository/metadata.staged/timestamp.json.gz differ diff --git a/tests/repository_data/repository/metadata/1.root.json b/tests/repository_data/repository/metadata/1.root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/repository/metadata/1.root.json +++ b/tests/repository_data/repository/metadata/1.root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/repository/metadata/1.root.json.gz b/tests/repository_data/repository/metadata/1.root.json.gz index c0f73a1757..5d5913af0a 100644 Binary files a/tests/repository_data/repository/metadata/1.root.json.gz and b/tests/repository_data/repository/metadata/1.root.json.gz differ diff --git a/tests/repository_data/repository/metadata/role1.json b/tests/repository_data/repository/metadata/role1.json index 45e4a14eff..e664618afd 100644 --- a/tests/repository_data/repository/metadata/role1.json +++ b/tests/repository_data/repository/metadata/role1.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "e10b2dd543312f298469336b05aef7f86c1314b654056b5b4e0345ec232275cff73d87ea33879d6af41989b2b6d633b8e675ec1b781572cbdff9389aaa461a0c" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "f747fdca082875e7f93cf269151a3f40a6ffdb62b4c772ccd0318ccacbded000c6cccc538b57cf8b1644f6de377b1fdf124ff8747d732e30cd2f4afd3251b00c" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role2", "paths": [], diff --git a/tests/repository_data/repository/metadata/role1.json.gz b/tests/repository_data/repository/metadata/role1.json.gz index 07ddf08330..4b9ff54595 100644 Binary files a/tests/repository_data/repository/metadata/role1.json.gz and b/tests/repository_data/repository/metadata/role1.json.gz differ diff --git a/tests/repository_data/repository/metadata/role2.json b/tests/repository_data/repository/metadata/role2.json index 22fbfccc2b..871be73aa2 100644 --- a/tests/repository_data/repository/metadata/role2.json +++ b/tests/repository_data/repository/metadata/role2.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9", - "method": "ed25519", - "sig": "734aee753376027d41abbfa5540a2e4c25a65c0c487698e59527dd93ad5e14847619738c4bfb68c5eff55045e8bddc430c6c89680a1a7aee42d11bdf3c8ef900" + "keyid": "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a", + "sig": "38a8a494cfdfd4cb855b89e8b119a44545dac3fb65153231c5338656c6c8c21effb2cd6292578a6ecd7374a0aed9051ce1e8c5ac2a6be90de900f1708bbb910f" } ], "signed": { diff --git a/tests/repository_data/repository/metadata/role2.json.gz b/tests/repository_data/repository/metadata/role2.json.gz index fa2c4407fd..6be24b7870 100644 Binary files a/tests/repository_data/repository/metadata/role2.json.gz and b/tests/repository_data/repository/metadata/role2.json.gz differ diff --git a/tests/repository_data/repository/metadata/root.json b/tests/repository_data/repository/metadata/root.json index f74a71712b..f6998b4bbb 100644 --- a/tests/repository_data/repository/metadata/root.json +++ b/tests/repository_data/repository/metadata/root.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503", - "method": "RSASSA-PSS", - "sig": "1176e335b12dbbec6e83e4b0cb578c339074a677ac8b00f13c72606147275b38049bb60058352dc130f27b99d818c17eba98e33b416fab7eab8e8c969ff4d9de14ae6896d3173c329bda23be57948040dd19d903a977f2ea5731ad5dac8ae64ca5fcf7777f872379d03adeb7798e8bb21f3ffa9e444c33f7412036131a135cbae7d059763bea1f53afc582f3bf6559a2ef99e99c8591970433b5e604d3a81622365bc60f7100d54393e9b74c495c7f6a3ebb170bc76e3efd4bd5ac1b9689b1e46af0195f401169fce97e08c1a137fe77d02b84036055fdd87612a90fa3bf42d2bd5a6af0e361f951ee2b4f73bbec59057a5d034c8063d27a799a155b93c480c2e3ccda24702c049625758d7e8204d8ca1565d3994679887284f2ffc6e93f42179616ac6df198ce27bf9375c513cdd0242a33dbea325af8060c67903bcc2c1af7c81bdb2a5f3e33150a3ba6315551d8c746fc7dbf79a34025aa2fdc5e2f8a99aacc6f05b3355d8e8f26fa7d4739082c1ccaa3dd76c3177b18fd2402b17ca4e1d2" + "keyid": "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb", + "sig": "3ee5f3ff801dd94e15757e8e0547ab83e86790ee4600cb7ee9089f626a8b1e7f76a6376f9037977da538d7820a02ee42236300fcfb1b10f3eec27b60ec18412e23733a6d0ac580d2e4b40ffd59c2af58b2f02ecad341d09463731bc385eb4ad2f4a5945bea2240b4ccaddd0e256906d2adf545666cd5710d56f8442718f65a90a9c594630949f04874cd3cc1753c00072ecbc78113c9509557dae3a831d6aed2002cb9e25f3287054a5b836c2d73c0addc747b18dd9b79a43397d00481aff104c78be80d489ae277822abe9aa96dc3eb1b4bed7c0f6c23da7bd75cdad0df1dd6b29e08fd95ab6b623f2b85ff8940cfe682e85a137a17681d0ca5a8700f62e96dd3de9aaef41e10007fb0c4891261ada171e4bf994759560fdf5a11871a3a17cb57cc6e017a0a6b4f6c46853a77bc25fe8d4cfdb59e6020b4576799005739e08387ca7db55f28008fb2c7daa7ae80ef15104a00aaf2fd3fd9dc3996217202c11274fbdc5e9904a8c0dc7f4ae3eb1fb997d3827d5e54d271c3df9a401949ebfb39" } ], "signed": { @@ -14,69 +13,73 @@ "consistent_snapshot": false, "expires": "2030-01-01T00:00:00Z", "keys": { - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9": { + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "ed25519", + "keytype": "rsa", "keyval": { - "public": "e8bd29d20025d3ac755a27b8d8efe185e368244000d9d3b76e32afb968cb0ea8" - } + "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----" + }, + "scheme": "rsassa-pss-sha256" }, - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1": { + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "52de9284608be6b718a9d88c7c5d8d9d93b33732e00d670dd4ebe4bce8bbc83c" - } + "public": "edcd0a32a07dce33f7c7873aaffbff36d20ea30787574ead335eefd337e4dacd" + }, + "scheme": "ed25519" }, - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": { + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093": { "keyid_hash_algorithms": [ "sha256", "sha512" ], - "keytype": "rsa", + "keytype": "ed25519", "keyval": { - "public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----" - } + "public": "89f28bd4ede5ec3786ab923fd154f39588d20881903e69c7b08fb504c6750815" + }, + "scheme": "ed25519" }, - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b": { + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "0692a846935833d685168ae8c98fee951d52d8aa76685b8ba55b8e1eada217c2" - } + "public": "82ccf6ac47298ff43bfa0cd639868894e305a99c723ff0515ae2e9856eb5bbf4" + }, + "scheme": "ed25519" } }, "roles": { "root": { "keyids": [ - "5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503" + "4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb" ], "threshold": 1 }, "snapshot": { "keyids": [ - "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9" + "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d" ], "threshold": 1 }, "targets": { "keyids": [ - "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b" + "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093" ], "threshold": 1 }, "timestamp": { "keyids": [ - "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1" + "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758" ], "threshold": 1 } diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json index db769f809f..bd124f5045 100644 --- a/tests/repository_data/repository/metadata/snapshot.json +++ b/tests/repository_data/repository/metadata/snapshot.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "182216b8800c50ddf000043b31ddf90d815c754ab4e0b31a5952a839b371bed9", - "method": "ed25519", - "sig": "6eca4489663994600fe909355d040e23e69acb9f13b53773d29e4eec2f7238e8534d65999d7060e7c701c8fe3129f092e98b2574554ccda9f0158d47988cae03" + "keyid": "59a4df8af818e9ed7abe0764c0b47b4240952aa0d179b5b78346c470ac30278d", + "sig": "14fa7b8082bcde5e2dca5bb2d939847c938685577c172e14d66cc9f67f3aa2925fdefacc995d52e9fc8e4961f555049f89afa7645d884d07c44d5cb1d59deb0d" } ], "signed": { diff --git a/tests/repository_data/repository/metadata/snapshot.json.gz b/tests/repository_data/repository/metadata/snapshot.json.gz index 32e95b7ee7..b482985be0 100644 Binary files a/tests/repository_data/repository/metadata/snapshot.json.gz and b/tests/repository_data/repository/metadata/snapshot.json.gz differ diff --git a/tests/repository_data/repository/metadata/targets.json b/tests/repository_data/repository/metadata/targets.json index 316679fef2..ee0cc59830 100644 --- a/tests/repository_data/repository/metadata/targets.json +++ b/tests/repository_data/repository/metadata/targets.json @@ -1,30 +1,30 @@ { "signatures": [ { - "keyid": "a0a0f0cf08daff7afd1eb6582756d43987aa73f028044836a5519259706ca19b", - "method": "ed25519", - "sig": "14f6e6566ec13c3089d4f266a248aa8948edcff1826d23cba88ba4d6c598df9127c017f0cdc580f5057ddda876a061dd5830a9e130aee15a530f917949fe4509" + "keyid": "65171251a9aff5a8b3143a813481cb07f6e0de4eb197c767837fe4491b739093", + "sig": "1aef441a6270ee834ddbc951c456d18c14971aa0f81b18f89da87e1fb6d3ec514c274c6d44d7d1be33ec08010f60d822640c43b7cca1da594709023443a9ff02" } ], "signed": { "_type": "targets", "delegations": { "keys": { - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9": { + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a": { "keyid_hash_algorithms": [ "sha256", "sha512" ], "keytype": "ed25519", "keyval": { - "public": "3b11296fe2dba14a2ef204e542e9e4195293bcf3042655e3d7e4ef5afe3cf36a" - } + "public": "fcf224e55fa226056adf113ef1eb3d55e308b75b321c8c8316999d8c4fd9e0d9" + }, + "scheme": "ed25519" } }, "roles": [ { "keyids": [ - "a0650f29dde63403cc4eec28a1c66f2262d6339434a01c63a881a48bedd9bca9" + "c8022fa1e9b9cb239a6b362bbdffa9649e61ad2cb699d2e4bc4fdf7930a0e64a" ], "name": "role1", "paths": [ diff --git a/tests/repository_data/repository/metadata/targets.json.gz b/tests/repository_data/repository/metadata/targets.json.gz index a0af09d039..0f54614b8d 100644 Binary files a/tests/repository_data/repository/metadata/targets.json.gz and b/tests/repository_data/repository/metadata/targets.json.gz differ diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json index 6262a5c2ce..5d3a3dbe0e 100644 --- a/tests/repository_data/repository/metadata/timestamp.json +++ b/tests/repository_data/repository/metadata/timestamp.json @@ -1,9 +1,8 @@ { "signatures": [ { - "keyid": "3f09f6468a522bea0364a23315872d8400875dfdb24ff4ecd32f27164d5c23c1", - "method": "ed25519", - "sig": "33ceb7fb3a54078e80ffc00bbdb291689de76d55d3da1a9ed13bee01c292c1172db8c203828e52cdc2f4e38b69da25662f3368f8c863be8d24a96b9b841d2a00" + "keyid": "8a1c4a3ac2d515dec982ba9910c5fd79b91ae57f625b9cff25d06bf0a61c1758", + "sig": "52d6c8d7a00682730a8923a95a865bd44135929236136b180c40de47783165b91f53e86c6f98b3ee136b8b84dc1c862304295ed3d1fe6a7cba52b7d1e1b5df0b" } ], "signed": { @@ -12,9 +11,9 @@ "meta": { "snapshot.json": { "hashes": { - "sha256": "62f2166c6e423e9b861106a63d67929ef8cd1ea015e3f2b147baee7b4530a91c" + "sha256": "eb30508426dc4bb14df321740e94d9c1e17daa942e7fc9c532f38aff6a05f716" }, - "length": 553, + "length": 529, "version": 1 } }, diff --git a/tests/repository_data/repository/metadata/timestamp.json.gz b/tests/repository_data/repository/metadata/timestamp.json.gz index 5842a0bfed..c5ce051f8b 100644 Binary files a/tests/repository_data/repository/metadata/timestamp.json.gz and b/tests/repository_data/repository/metadata/timestamp.json.gz differ diff --git a/tests/test_formats.py b/tests/test_formats.py index 71f000046d..56e124e66c 100755 --- a/tests/test_formats.py +++ b/tests/test_formats.py @@ -66,7 +66,7 @@ def test_schemas(self): 'KEYIDS_SCHEMA': (securesystemslib.formats.KEYIDS_SCHEMA, ['123456789abcdef', '123456789abcdef']), - 'SIG_METHOD_SCHEMA': (securesystemslib.formats.SIG_METHOD_SCHEMA, 'ed25519'), + 'SIG_SCHEME_SCHEMA': (securesystemslib.formats.SIG_SCHEME_SCHEMA, 'rsassa-pss-sha256'), 'RELPATH_SCHEMA': (securesystemslib.formats.RELPATH_SCHEMA, 'metadata/root/'), @@ -105,11 +105,13 @@ def test_schemas(self): 'KEY_SCHEMA': (securesystemslib.formats.KEY_SCHEMA, {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}), 'RSAKEY_SCHEMA': (securesystemslib.formats.RSAKEY_SCHEMA, {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyid': '123456789abcdef', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}), @@ -138,7 +140,6 @@ def test_schemas(self): 'SIGNATURE_SCHEMA': (securesystemslib.formats.SIGNATURE_SCHEMA, {'keyid': '123abc', - 'method': 'evp', 'sig': 'A4582BCF323BCEF'}), 'SIGNATURESTATUS_SCHEMA': (securesystemslib.formats.SIGNATURESTATUS_SCHEMA, @@ -147,21 +148,22 @@ def test_schemas(self): 'bad_sigs': ['123abc'], 'unknown_sigs': ['123abc'], 'untrusted_sigs': ['123abc'], - 'unknown_method_sigs': ['123abc']}), + 'unknown_signing_schemes': ['123abc']}), 'SIGNABLE_SCHEMA': (tuf.formats.SIGNABLE_SCHEMA, {'signed': 'signer', 'signatures': [{'keyid': '123abc', - 'method': 'evp', 'sig': 'A4582BCF323BCEF'}]}), 'KEYDICT_SCHEMA': (securesystemslib.formats.KEYDICT_SCHEMA, {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}), 'KEYDB_SCHEMA': (securesystemslib.formats.KEYDB_SCHEMA, {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyid': '123456789abcdef', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}), @@ -200,6 +202,7 @@ def test_schemas(self): 'compression_algorithms': ['gz'], 'expires': '1985-10-21T13:20:00Z', 'keys': {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}, 'roles': {'root': {'keyids': ['123abc'], @@ -214,6 +217,7 @@ def test_schemas(self): 'hashes': {'sha256': 'ABCD123'}, 'custom': {'type': 'metadata'}}}, 'delegations': {'keys': {'123abc': {'keytype':'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}, 'roles': [{'name': 'root', 'keyids': ['123abc'], @@ -260,6 +264,8 @@ def test_schemas(self): # Iterate 'valid_schemas', ensuring each 'valid_schema' correctly matches # its respective 'schema_type'. for schema_name, (schema_type, valid_schema) in six.iteritems(valid_schemas): + if not schema_type.matches(valid_schema): + print('bad schema: ' + repr(valid_schema)) self.assertEqual(True, schema_type.matches(valid_schema)) # Test conditions for invalid schemas. @@ -337,6 +343,7 @@ def test_RootFile(self): expires = '1985-10-21T13:20:00Z' keydict = {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}} @@ -430,6 +437,7 @@ def test_TargetsFile(self): 'custom': {'type': 'metadata'}}} delegations = {'keys': {'123abc': {'keytype':'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}, 'roles': [{'name': 'root', 'keyids': ['123abc'], @@ -554,6 +562,7 @@ def test_make_signable(self): 'compression_algorithms': ['gz'], 'expires': '1985-10-21T13:20:00Z', 'keys': {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}, 'roles': {'root': {'keyids': ['123abc'], @@ -703,6 +712,7 @@ def test_check_signable_object_format(self): 'compression_algorithms': ['gz'], 'expires': '1985-10-21T13:20:00Z', 'keys': {'123abc': {'keytype': 'rsa', + 'scheme': 'rsassa-pss-sha256', 'keyval': {'public': 'pubkey', 'private': 'privkey'}}}, 'roles': {'root': {'keyids': ['123abc'], diff --git a/tests/test_repository_lib.py b/tests/test_repository_lib.py index a3ef34ee6e..675cce3e8e 100755 --- a/tests/test_repository_lib.py +++ b/tests/test_repository_lib.py @@ -71,6 +71,8 @@ def setUpClass(cls): # Create a temporary directory to store the repository, metadata, and target # files. 'temporary_directory' must be deleted in TearDownClass() so that # temporary files are always removed, even when exceptions occur. + tuf.roledb.clear_roledb(clear_all=True) + tuf.keydb.clear_keydb(clear_all=True) cls.temporary_directory = tempfile.mkdtemp(dir=os.getcwd()) @@ -83,6 +85,8 @@ def tearDownClass(cls): # Remove the temporary repository directory, which should contain all the # metadata, targets, and key files generated for the test cases. + tuf.roledb.clear_roledb(clear_all=True) + tuf.keydb.clear_keydb(clear_all=True) shutil.rmtree(cls.temporary_directory) @@ -274,8 +278,10 @@ def test_import_ed25519_publickey_from_file(self): # Invalid public key imported (contains unexpected keytype.) keytype = imported_ed25519_key['keytype'] keyval = imported_ed25519_key['keyval'] + scheme = imported_ed25519_key['scheme'] ed25519key_metadata_format = \ - securesystemslib.keys.format_keyval_to_metadata(keytype, keyval, private=False) + securesystemslib.keys.format_keyval_to_metadata(keytype, scheme, + keyval, private=False) ed25519key_metadata_format['keytype'] = 'invalid_keytype' with open(ed25519_keypath + '.pub', 'wb') as file_object: diff --git a/tests/test_sig.py b/tests/test_sig.py index 43c5050518..c68a4de6e7 100755 --- a/tests/test_sig.py +++ b/tests/test_sig.py @@ -70,7 +70,7 @@ def test_get_signature_status_no_role(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) # A valid signable, but non-existent role argument. self.assertRaises(tuf.exceptions.UnknownRoleError, @@ -116,7 +116,7 @@ def test_get_signature_status_bad_sig(self): self.assertEqual([KEYS[0]['keyid']], sig_status['bad_sigs']) self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) self.assertFalse(tuf.sig.verify(signable, 'Root')) @@ -126,20 +126,21 @@ def test_get_signature_status_bad_sig(self): tuf.roledb.remove_role('Root') - def test_get_signature_status_unknown_method(self): + def test_get_signature_status_unknown_signing_scheme(self): signable = {'signed' : 'test', 'signatures' : []} signable['signatures'].append(securesystemslib.keys.create_signature( KEYS[0], signable['signed'])) - signable['signatures'][0]['method'] = 'fake-sig-method' + valid_scheme = KEYS[0]['scheme'] + KEYS[0]['scheme'] = 'unknown_signing_scheme' tuf.keydb.add_key(KEYS[0]) threshold = 1 roleinfo = tuf.formats.make_role_metadata( [KEYS[0]['keyid']], threshold) - tuf.roledb.add_role('Root', roleinfo) + tuf.roledb.add_role('root', roleinfo) - sig_status = tuf.sig.get_signature_status(signable, 'Root') + sig_status = tuf.sig.get_signature_status(signable, 'root') self.assertEqual(1, sig_status['threshold']) self.assertEqual([], sig_status['good_sigs']) @@ -147,14 +148,15 @@ def test_get_signature_status_unknown_method(self): self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) self.assertEqual([KEYS[0]['keyid']], - sig_status['unknown_method_sigs']) + sig_status['unknown_signing_schemes']) - self.assertFalse(tuf.sig.verify(signable, 'Root')) + self.assertFalse(tuf.sig.verify(signable, 'root')) # Done. Let's remove the added key(s) from the key database. + KEYS[0]['scheme'] = valid_scheme tuf.keydb.remove_key(KEYS[0]['keyid']) # Remove the role. - tuf.roledb.remove_role('Root') + tuf.roledb.remove_role('root') def test_get_signature_status_single_key(self): @@ -177,7 +179,7 @@ def test_get_signature_status_single_key(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) self.assertTrue(tuf.sig.verify(signable, 'Root')) @@ -189,7 +191,7 @@ def test_get_signature_status_single_key(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([KEYS[0]['keyid']], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) # Done. Let's remove the added key(s) from the key database. tuf.keydb.remove_key(KEYS[0]['keyid']) @@ -217,7 +219,7 @@ def test_get_signature_status_below_threshold(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) self.assertFalse(tuf.sig.verify(signable, 'Root')) @@ -252,7 +254,7 @@ def test_get_signature_status_below_threshold_unrecognized_sigs(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([KEYS[2]['keyid']], sig_status['unknown_sigs']) self.assertEqual([], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) self.assertFalse(tuf.sig.verify(signable, 'Root')) @@ -291,7 +293,7 @@ def test_get_signature_status_below_threshold_unauthorized_sigs(self): self.assertEqual([], sig_status['bad_sigs']) self.assertEqual([], sig_status['unknown_sigs']) self.assertEqual([KEYS[1]['keyid']], sig_status['untrusted_sigs']) - self.assertEqual([], sig_status['unknown_method_sigs']) + self.assertEqual([], sig_status['unknown_signing_schemes']) self.assertFalse(tuf.sig.verify(signable, 'Root')) diff --git a/tuf/developer_tool.py b/tuf/developer_tool.py index df2215795c..a39e4df566 100755 --- a/tuf/developer_tool.py +++ b/tuf/developer_tool.py @@ -764,7 +764,7 @@ def _save_project_configuration(metadata_directory, targets_directory, for key in public_keys: key_info = tuf.keydb.get_key(key) key_metadata = format_keyval_to_metadata(key_info['keytype'], - key_info['keyval']) + key_info['scheme'], key_info['keyval']) project_config['public_keys'][key] = key_metadata # Save the actual file. diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index 338e504939..c189dbf595 100755 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -1318,8 +1318,10 @@ def generate_root_metadata(version, expiration_date, consistent_snapshot, if key['keytype'] in ['rsa', 'ed25519']: keytype = key['keytype'] keyval = key['keyval'] + scheme = key['scheme'] keydict[keyid] = \ - securesystemslib.keys.format_keyval_to_metadata(keytype, keyval, private=False) + securesystemslib.keys.format_keyval_to_metadata(keytype, + scheme, keyval, private=False) # This is not a recognized key. Raise an exception. else: diff --git a/tuf/repository_tool.py b/tuf/repository_tool.py index b84e21cd5b..9a041077a5 100755 --- a/tuf/repository_tool.py +++ b/tuf/repository_tool.py @@ -2321,7 +2321,8 @@ def delegate(self, rolename, public_keys, list_of_targets, threshold=1, for key in public_keys: keyid = key['keyid'] key_metadata_format = securesystemslib.keys.format_keyval_to_metadata(key['keytype'], - key['keyval']) + key['scheme'], key['keyval']) + # Update 'keyids' and 'keydict'. new_keydict = {keyid: key_metadata_format} keydict.update(new_keydict) diff --git a/tuf/sig.py b/tuf/sig.py index 0f3b45c99c..32db62d34e 100755 --- a/tuf/sig.py +++ b/tuf/sig.py @@ -70,14 +70,13 @@ def get_signature_status(signable, role=None, repository_name='default', keys in 'tuf.keydb', a set of roles in 'tuf.roledb', and a role, the status of these signatures can be determined. This method will iterate the signatures in 'signable' and enumerate all the keys that are valid, - invalid, unrecognized, unauthorized, or generated using an unknown method. + invalid, unrecognized, or unauthorized. signable: A dictionary containing a list of signatures and a 'signed' identifier. signable = {'signed': 'signer', 'signatures': [{'keyid': keyid, - 'method': 'evp', 'sig': sig}]} Conformant to tuf.formats.SIGNABLE_SCHEMA. @@ -132,19 +131,24 @@ def get_signature_status(signable, role=None, repository_name='default', # The fields of the signature_status dict, where each field stores keyids. A # description of each field: - # good_sigs = keys confirmed to have produced 'sig' and 'method' using - # 'signed', which are associated with 'role'; + # + # good_sigs = keys confirmed to have produced 'sig' using 'signed', which are + # associated with 'role'; + # # bad_sigs = negation of good_sigs; + # # unknown_sigs = keys not found in the 'keydb' database; + # # untrusted_sigs = keys that are not in the list of keyids associated with # 'role'; - # unknown_method_sigs = keys found to have used an unsupported method - # of generating signatures. + # + # unknown_signing_scheme = signing schemes specified in keys that are + # unsupported; good_sigs = [] bad_sigs = [] unknown_sigs = [] untrusted_sigs = [] - unknown_method_sigs = [] + unknown_signing_schemes = [] # Extract the relevant fields from 'signable' that will allow us to identify # the different classes of keys (i.e., good_sigs, bad_sigs, etc.). @@ -156,7 +160,6 @@ def get_signature_status(signable, role=None, repository_name='default', for signature in signatures: sig = signature['sig'] keyid = signature['keyid'] - method = signature['method'] # Does the signature use an unrecognized key? try: @@ -166,12 +169,12 @@ def get_signature_status(signable, role=None, repository_name='default', unknown_sigs.append(keyid) continue - # Does the signature use an unknown key signing method? + # Does the signature use an unknown/unsupported signing scheme? try: valid_sig = securesystemslib.keys.verify_signature(key, signature, signed) - except securesystemslib.exceptions.UnknownMethodError: - unknown_method_sigs.append(keyid) + except securesystemslib.exceptions.UnsupportedAlgorithmError: + unknown_signing_schemes.append(keyid) continue # We are now dealing with either a trusted or untrusted key... @@ -223,7 +226,7 @@ def get_signature_status(signable, role=None, repository_name='default', signature_status['bad_sigs'] = bad_sigs signature_status['unknown_sigs'] = unknown_sigs signature_status['untrusted_sigs'] = untrusted_sigs - signature_status['unknown_method_sigs'] = unknown_method_sigs + signature_status['unknown_signing_schemes'] = unknown_signing_schemes return signature_status