diff --git a/src/aktualizr_repo/CMakeLists.txt b/src/aktualizr_repo/CMakeLists.txt index 788f40cb4b..86ec52a072 100644 --- a/src/aktualizr_repo/CMakeLists.txt +++ b/src/aktualizr_repo/CMakeLists.txt @@ -7,6 +7,7 @@ set(AKTUALIZR_REPO_LIBS ${AKTUALIZR_EXTERNAL_LIBS} ) add_library(aktualizr_repo_lib ${AKTUALIZR_REPO_SRC}) +target_include_directories(aktualizr_repo_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_executable(aktualizr-repo main.cc ${AKTUALIZR_REPO_SRC}) target_link_libraries(aktualizr-repo ${AKTUALIZR_REPO_LIBS}) diff --git a/src/aktualizr_secondary/CMakeLists.txt b/src/aktualizr_secondary/CMakeLists.txt index e19f8d9dec..43833c1583 100644 --- a/src/aktualizr_secondary/CMakeLists.txt +++ b/src/aktualizr_secondary/CMakeLists.txt @@ -60,6 +60,7 @@ add_aktualizr_test(NAME aktualizr_secondary_update if(BUILD_OSTREE) add_aktualizr_test(NAME aktualizr_secondary_uptane SOURCES uptane_test.cc + LIBRARIES PUBLIC aktualizr_repo_lib LIBRARIES aktualizr-posix ARGS ${PROJECT_BINARY_DIR}/ostree_repo PROJECT_WORKING_DIRECTORY) else(BUILD_OSTREE) diff --git a/src/libaktualizr/package_manager/CMakeLists.txt b/src/libaktualizr/package_manager/CMakeLists.txt index 181c19af12..add18c345e 100644 --- a/src/libaktualizr/package_manager/CMakeLists.txt +++ b/src/libaktualizr/package_manager/CMakeLists.txt @@ -49,7 +49,7 @@ endif(BUILD_OSTREE) add_aktualizr_test(NAME packagemanager_factory SOURCES packagemanagerfactory_test.cc NO_VALGRIND ARGS ${PROJECT_BINARY_DIR}/ostree_repo) -add_aktualizr_test(NAME fetcher SOURCES fetcher_test.cc ARGS PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME fetcher SOURCES fetcher_test.cc ARGS PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) add_aktualizr_test(NAME fetcher_death SOURCES fetcher_death_test.cc NO_VALGRIND ARGS PROJECT_WORKING_DIRECTORY) aktualizr_source_file_checks(fetcher_death_test.cc fetcher_test.cc) diff --git a/src/libaktualizr/primary/CMakeLists.txt b/src/libaktualizr/primary/CMakeLists.txt index 507277e6b3..df4ef5b149 100644 --- a/src/libaktualizr/primary/CMakeLists.txt +++ b/src/libaktualizr/primary/CMakeLists.txt @@ -13,7 +13,7 @@ set(HEADERS aktualizr.h add_library(primary OBJECT ${SOURCES}) -add_aktualizr_test(NAME aktualizr SOURCES aktualizr_test.cc PROJECT_WORKING_DIRECTORY ARGS ${PROJECT_BINARY_DIR}/uptane_repos) +add_aktualizr_test(NAME aktualizr SOURCES aktualizr_test.cc PROJECT_WORKING_DIRECTORY ARGS ${PROJECT_BINARY_DIR}/uptane_repos LIBRARIES PUBLIC aktualizr_repo_lib) add_dependencies(t_aktualizr uptane_repo_full_no_correlation_id) if (BUILD_OSTREE) @@ -25,10 +25,10 @@ else (BUILD_OSTREE) aktualizr_source_file_checks(aktualizr_fullostree_test.cc) endif (BUILD_OSTREE) -add_aktualizr_test(NAME reportqueue SOURCES reportqueue_test.cc PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME reportqueue SOURCES reportqueue_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) add_aktualizr_test(NAME emptytargets SOURCES empty_targets_test.cc PROJECT_WORKING_DIRECTORY - ARGS "$") -add_aktualizr_test(NAME device_cred_prov SOURCES device_cred_prov_test.cc PROJECT_WORKING_DIRECTORY) + ARGS "$" LIBRARIES PUBLIC aktualizr_repo_lib) +add_aktualizr_test(NAME device_cred_prov SOURCES device_cred_prov_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) set_tests_properties(test_device_cred_prov PROPERTIES LABELS "crypto") diff --git a/src/libaktualizr/uptane/CMakeLists.txt b/src/libaktualizr/uptane/CMakeLists.txt index eed82d1ec4..118093e521 100644 --- a/src/libaktualizr/uptane/CMakeLists.txt +++ b/src/libaktualizr/uptane/CMakeLists.txt @@ -49,26 +49,26 @@ else(BUILD_OSTREE AND SOTA_PACKED_CREDENTIALS) endif(BUILD_OSTREE AND SOTA_PACKED_CREDENTIALS) -add_aktualizr_test(NAME uptane SOURCES uptane_test.cc PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME uptane SOURCES uptane_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) set_tests_properties(test_uptane PROPERTIES LABELS "crypto") add_aktualizr_test(NAME uptane_delegation SOURCES uptane_delegation_test.cc PROJECT_WORKING_DIRECTORY - ARGS "$") + ARGS "$" LIBRARIES PUBLIC aktualizr_repo_lib) add_dependencies(t_uptane_delegation aktualizr-repo) set_tests_properties(test_uptane_delegation PROPERTIES LABELS "crypto") -add_aktualizr_test(NAME uptane_key SOURCES uptane_key_test.cc PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME uptane_key SOURCES uptane_key_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) set_tests_properties(test_uptane_key PROPERTIES LABELS "crypto") add_aktualizr_test(NAME uptane_network SOURCES uptane_network_test.cc PROJECT_WORKING_DIRECTORY) set_tests_properties(test_uptane_network PROPERTIES LABELS "crypto") -add_aktualizr_test(NAME uptane_secondary SOURCES uptane_secondary_test.cc PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME uptane_secondary SOURCES uptane_secondary_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) add_aktualizr_test(NAME uptane_serial SOURCES uptane_serial_test.cc ARGS ${PROJECT_BINARY_DIR} - PROJECT_WORKING_DIRECTORY) + PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) -add_aktualizr_test(NAME uptane_init SOURCES uptane_init_test.cc PROJECT_WORKING_DIRECTORY) +add_aktualizr_test(NAME uptane_init SOURCES uptane_init_test.cc PROJECT_WORKING_DIRECTORY LIBRARIES PUBLIC aktualizr_repo_lib) add_aktualizr_test(NAME director SOURCES director_test.cc PROJECT_WORKING_DIRECTORY ARGS "$") diff --git a/src/libaktualizr/uptane/uptane_secondary_test.cc b/src/libaktualizr/uptane/uptane_secondary_test.cc index fbc486ecf3..8b9d92d2cc 100644 --- a/src/libaktualizr/uptane/uptane_secondary_test.cc +++ b/src/libaktualizr/uptane/uptane_secondary_test.cc @@ -1,5 +1,6 @@ #include +#include "metafake.h" #include "uptane/partialverificationsecondary.h" #include "uptane/secondaryconfig.h" #include "uptane/secondaryfactory.h" @@ -79,8 +80,10 @@ TEST(SecondaryFactory, Uptane_putMetadata_good) { Uptane::PartialVerificationSecondary sec(sconfig); Uptane::RawMetaPack metadata; - metadata.director_root = Utils::readFile("tests/test_data/repo/repo/director/root.json"); - metadata.director_targets = Utils::readFile("tests/test_data/repo/repo/director/targets_hasupdates.json"); + boost::filesystem::path meta_dir = temp_dir / "meta_fake"; + MetaFake meta(meta_dir); + metadata.director_root = Utils::readFile(meta_dir / "repo/director/root.json"); + metadata.director_targets = Utils::readFile(meta_dir / "repo/director/targets_hasupdates.json"); EXPECT_NO_THROW(sec.putMetadata(metadata)); } @@ -101,9 +104,11 @@ TEST(SecondaryFactory, Uptane_putMetadata_bad) { Uptane::PartialVerificationSecondary sec(sconfig); Uptane::RawMetaPack metadata; - metadata.director_root = Utils::readFile("tests/test_data/repo/repo/director/root.json"); + boost::filesystem::path meta_dir = temp_dir / "meta_fake"; + MetaFake meta(meta_dir); + metadata.director_root = Utils::readFile(meta_dir / "repo/director/root.json"); - Json::Value json_targets = Utils::parseJSONFile("tests/test_data/repo/repo/director/targets_hasupdates.json"); + Json::Value json_targets = Utils::parseJSONFile(meta_dir / "repo/director/targets_hasupdates.json"); json_targets["signatures"][0]["sig"] = "Wrong signature"; metadata.director_targets = Utils::jsonToStr(json_targets); EXPECT_THROW(sec.putMetadata(metadata), Uptane::BadKeyId); diff --git a/tests/httpfake.h b/tests/httpfake.h index 4761783c26..150fa3a0f9 100644 --- a/tests/httpfake.h +++ b/tests/httpfake.h @@ -14,6 +14,7 @@ #include "crypto/crypto.h" #include "http/httpinterface.h" #include "logging/logging.h" +#include "metafake.h" #include "utilities/utils.h" enum class ProvisioningResult { kOK, kFailure }; @@ -26,10 +27,13 @@ class HttpFake : public HttpInterface { : test_dir(test_dir_in), flavor_(std::move(flavor)), meta_dir(meta_dir_in) { if (meta_dir.empty()) { meta_dir = temp_meta_dir.Path(); - Utils::copyDir("tests/test_data/repo/repo/image", meta_dir / "repo"); - Utils::copyDir("tests/test_data/repo/repo/director", meta_dir / "director"); - if (boost::filesystem::is_directory("tests/test_data/repo/campaigner")) { - Utils::copyDir("tests/test_data/repo/campaigner", meta_dir / "campaigner"); + + boost::filesystem::path gen_dir = meta_dir / "meta_fake"; + MetaFake meta(gen_dir); + Utils::copyDir(gen_dir / "repo/image", meta_dir / "repo"); + Utils::copyDir(gen_dir / "repo/director", meta_dir / "director"); + if (boost::filesystem::is_directory("tests/test_data/campaigner")) { + Utils::copyDir("tests/test_data/campaigner", meta_dir / "campaigner"); } } } @@ -173,6 +177,55 @@ class HttpFake : public HttpInterface { */ HttpResponse post(const std::string &url, const std::string data); HttpResponse put(const std::string &url, const std::string data); + + void backup_metadata(const boost::filesystem::path &dir) { + director_targets_path = dir / "repo/director/targets.json"; + director_targets = Utils::readFile(director_targets_path, false); + image_snapshot_path = dir / "repo/image/snapshot.json"; + image_snapshot = Utils::readFile(image_snapshot_path, false); + image_targets_path = dir / "repo/image/targets.json"; + image_targets = Utils::readFile(image_targets_path, false); + image_timestamp_path = dir / "repo/image/timestamp.json"; + image_timestamp = Utils::readFile(image_timestamp_path, false); + } + + void restore_metadata(void) { + Utils::writeFile(director_targets_path, director_targets); + Utils::writeFile(image_snapshot_path, image_snapshot); + Utils::writeFile(image_targets_path, image_targets); + Utils::writeFile(image_timestamp_path, image_timestamp); + } + + void delete_backup(void) { + boost::filesystem::remove(director_targets_path); + boost::filesystem::remove(image_snapshot_path); + boost::filesystem::remove(image_targets_path); + boost::filesystem::remove(image_timestamp_path); + } + + void rename_metadata(const std::string &appendix) { + boost::filesystem::rename( + director_targets_path, + (director_targets_path.parent_path() / director_targets_path.stem()).string() + appendix + ".json"); + boost::filesystem::rename( + image_snapshot_path, + (image_snapshot_path.parent_path() / image_snapshot_path.stem()).string() + appendix + ".json"); + boost::filesystem::rename( + image_targets_path, + (image_targets_path.parent_path() / image_targets_path.stem()).string() + appendix + ".json"); + boost::filesystem::rename( + image_timestamp_path, + (image_timestamp_path.parent_path() / image_timestamp_path.stem()).string() + appendix + ".json"); + } + + boost::filesystem::path director_targets_path; + std::string director_targets; + boost::filesystem::path image_snapshot_path; + std::string image_snapshot; + boost::filesystem::path image_targets_path; + std::string image_targets; + boost::filesystem::path image_timestamp_path; + std::string image_timestamp; }; #endif // HTTPFAKE_H_ diff --git a/tests/metafake.h b/tests/metafake.h new file mode 100644 index 0000000000..457aa73546 --- /dev/null +++ b/tests/metafake.h @@ -0,0 +1,126 @@ +#ifndef METAFAKE_H_ +#define METAFAKE_H_ + +#include +#include +#include +#include + +#include "logging/logging.h" +#include "utilities/utils.h" +#include "uptane_repo.h" + +enum BackupList { +}; + +class MetaFake { + public: + MetaFake(const boost::filesystem::path &meta_dir_in) + : meta_dir(meta_dir_in), repo(meta_dir_in, "2021-07-04T16:33:27Z", "id0") { + // generate original repo data + repo.generateRepo(KeyType::kRSA2048); + backup(); + create_image(); + create_testData(); + } + + private: + void create_testData(void) { + boost::filesystem::path file_name; + Delegation delegation; + + // add image for "has update" meta + file_name = "dummy_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + + file_name = "primary_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + repo.addTarget(file_name.string(), "primary_hw", "CA:FE:A6:D2:84:9D"); + + file_name = "secondary_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + repo.addTarget(file_name.string(), "secondary_hw", "secondary_ecu_serial"); + + repo.signTargets(); + rename("_hasupdates"); + + // add image for "no update" meta + restore(); + + file_name = "dummy_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + + repo.signTargets(); + rename("_noupdates"); + + // add image for "multi secondary ecu" meta + restore(); + + file_name = "dummy_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + + file_name = "secondary_firmware.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + repo.addTarget(file_name.string(), "sec_hwid1", "sec_serial1"); + + file_name = "secondary_firmware2.txt"; + repo.addImage(meta_dir / file_name, file_name, delegation); + repo.addTarget(file_name.string(), "sec_hwid2", "sec_serial2"); + + repo.signTargets(); + rename("_multisec"); + delete_backup(); + } + + void create_image(void) { + std::string content = "Just to increment timestamp, ignore it\n"; + Utils::writeFile(meta_dir / "dummy_firmware.txt", content); + content = "This is a dummy firmware file (should never be downloaded)\n"; + Utils::writeFile(meta_dir / "primary_firmware.txt", content); + content = "This is content"; + Utils::writeFile(meta_dir / "secondary_firmware.txt", content); + content = "This is more content\n"; + Utils::writeFile(meta_dir / "secondary_firmware2.txt", content); + } + + void backup(void) { + backup_files.push_back(meta_dir / "repo/director/targets.json"); + backup_content.push_back(Utils::readFile(backup_files[0], false)); + + backup_files.push_back(meta_dir / "repo/image/snapshot.json"); + backup_content.push_back(Utils::readFile(backup_files[1], false)); + + backup_files.push_back(meta_dir / "repo/image/targets.json"); + backup_content.push_back(Utils::readFile(backup_files[2], false)); + + backup_files.push_back(meta_dir / "repo/image/timestamp.json"); + backup_content.push_back(Utils::readFile(backup_files[3], false)); + } + + void restore(void) { + for (unsigned int i=0; i < backup_files.size(); i++) { + Utils::writeFile(backup_files[i], backup_content[i]); + } + } + + void delete_backup(void) { + for (unsigned int i=0; i < backup_files.size(); i++) { + boost::filesystem::remove(backup_files[i]); + } + } + + void rename(const std::string &appendix) { + for (unsigned int i=0; i < backup_files.size(); i++) { + boost::filesystem::rename(backup_files[i], + (backup_files[i].parent_path() / backup_files[i].stem()).string() + appendix + ".json"); + } + } + + private: + boost::filesystem::path meta_dir; + UptaneRepo repo; + std::vector backup_files; + std::vector backup_content; +}; + +#endif // METAFAKE_H diff --git a/tests/test_data/campaigner/campaigns.json b/tests/test_data/campaigner/campaigns.json new file mode 120000 index 0000000000..bfdd20f95b --- /dev/null +++ b/tests/test_data/campaigner/campaigns.json @@ -0,0 +1 @@ +../../../src/libaktualizr/campaign/test/campaigns_sample.json \ No newline at end of file diff --git a/tests/test_data/repo/campaigner/campaigns.json b/tests/test_data/repo/campaigner/campaigns.json deleted file mode 120000 index 988e2beea5..0000000000 --- a/tests/test_data/repo/campaigner/campaigns.json +++ /dev/null @@ -1 +0,0 @@ -../../../../src/libaktualizr/campaign/test/campaigns_sample.json \ No newline at end of file diff --git a/tests/test_data/repo/generate.sh b/tests/test_data/repo/generate.sh deleted file mode 100755 index 69b1cf425d..0000000000 --- a/tests/test_data/repo/generate.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -set -exuo pipefail - -DEST_DIR=${1:-"."} -REPO_DIR=$DEST_DIR/repo -CMAKE_BUILD_DIR=${2:-"../../../build"} - -AKTUALIZR_REPO=${AKTUALIZR_REPO:-"$CMAKE_BUILD_DIR/src/aktualizr_repo/aktualizr-repo"} - -akrepo() { - "$AKTUALIZR_REPO" --path "$DEST_DIR" "$@" -} - -move_meta() { - NAME="$1" - mv "$REPO_DIR/director/targets.json" "$REPO_DIR/director/targets_$NAME.json" - mv "$REPO_DIR/image/snapshot.json" "$REPO_DIR/image/snapshot_$NAME.json" - mv "$REPO_DIR/image/targets.json" "$REPO_DIR/image/targets_$NAME.json" - mv "$REPO_DIR/image/timestamp.json" "$REPO_DIR/image/timestamp_$NAME.json" -} - -orig_meta() { - echo "$dirtargets0" > "$REPO_DIR/director/targets.json" - echo "$imgsnapshot0" > "$REPO_DIR/image/snapshot.json" - echo "$imgtargets0" > "$REPO_DIR/image/targets.json" - echo "$imgtimestamp0" > "$REPO_DIR/image/timestamp.json" -} - -akrepo --command generate --expires 2021-07-04T16:33:27Z --correlationid id0 - -dirtargets0=$(cat "$REPO_DIR/director/targets.json") -imgsnapshot0=$(cat "$REPO_DIR/image/snapshot.json") -imgtargets0=$(cat "$REPO_DIR/image/targets.json") -imgtimestamp0=$(cat "$REPO_DIR/image/timestamp.json") - -# has update -akrepo --command image --filename "$REPO_DIR/image/targets/dummy_firmware.txt" -akrepo --command image --filename "$REPO_DIR/image/targets/primary_firmware.txt" -akrepo --command image --filename "$REPO_DIR/image/targets/secondary_firmware.txt" -akrepo --command addtarget --hwid primary_hw --serial CA:FE:A6:D2:84:9D --targetname primary_firmware.txt -akrepo --command addtarget --hwid secondary_hw --serial secondary_ecu_serial --targetname secondary_firmware.txt -akrepo --command signtargets -move_meta hasupdates -orig_meta - -# no update -akrepo --command image --filename "$REPO_DIR/image/targets/dummy_firmware.txt" -akrepo --command signtargets -move_meta noupdates -orig_meta - -# multisec -akrepo --command image --filename "$REPO_DIR/image/targets/dummy_firmware.txt" -akrepo --command image --filename "$REPO_DIR/image/targets/secondary_firmware.txt" -akrepo --command image --filename "$REPO_DIR/image/targets/secondary_firmware2.txt" -akrepo --command addtarget --hwid sec_hwid1 --serial sec_serial1 --targetname secondary_firmware.txt -akrepo --command addtarget --hwid sec_hwid2 --serial sec_serial2 --targetname secondary_firmware2.txt -akrepo --command signtargets -move_meta multisec diff --git a/tests/test_data/repo/keys/director/key_type b/tests/test_data/repo/keys/director/key_type deleted file mode 100644 index 3605ceee18..0000000000 --- a/tests/test_data/repo/keys/director/key_type +++ /dev/null @@ -1 +0,0 @@ -"RSA2048" \ No newline at end of file diff --git a/tests/test_data/repo/keys/director/private.key b/tests/test_data/repo/keys/director/private.key deleted file mode 100644 index f2bb7259ad..0000000000 --- a/tests/test_data/repo/keys/director/private.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxKtEgqt9VvDsLAbnP+CcqTmchCUyIuL1qNzRNOWrlo9XTuHT -uP2EbfIOeyeh4dL83MU+75qFEg92X0X+cMN9DEdXYChsXk5oqQoZ8dwLkAfkaMn0 -sFeCDXAc4XG//OuagP+ZuHgd1O2GcS/VxLMJIQ+a7f1HnyCWEx5D3Cf9hH06pEwR -xdR48OlcvTzBW9U0xDe35LWBk4SpfCVH5dhKrrdF6WXV7S59IyreCwE2jmkv2i+q -DqgBJJP6FD1KZKi8smknzKrLAlrwGMFU8LjxskOFaP+ywdHysJ5gqSO1AP3C5Dzt -GDl0FlPe9RdqzvksRyCGXgk66vj7M13kyCEguQIDAQABAoIBAQCqqQwsb++2EB6B -HgRxs9F+L5YYPcbB6zzNqcCJLHu3jO9wbhqxvpy6Y4AZcozRT6tJUIiKlwW+ZFiN -2EkxRRIwI4A42xsewt+jQDa/X/lQpOiZ3hZNJ8KdMpp9L54wNaq/Ig4cu273pJ4z -fhT8OXhEjiwdNNp/xWE1ed/dHX6rBhDsCRPEwOjHfgxWqpoYAmH5/KNCXV63gyHF -i2DPiGcBUBejBfYlU7+Al4PLvSY4s+npjvI6s4oIuiCafyEDdyJ3HuOLUbMxp0Gi -qvto7/r03yPmJ7r99tOSErY47rVwiPzlS9XirieU+T8tBwWpXIOs4zbLCCReQxFb -Zoz9RboBAoGBAPjDiuZ6jK63Np0KtGoE6O56fWuzjZv/rJKVuzlarKGgc991o7BY -1UzJ7LOMNq7/8jQRh7X/56NnjcmQrhyPmf+k4KrESyPgBjQDPKE/ZQQCjXbhg9P7 -nHRPTL/fC2LwQFQ7c+tmGuJoMLTeEJE2mAf+V4JenHlew47l1gCbYXUZAoGBAMpj -ywc84/5w37OVzMBf6i+ZSxrntzOVnk1v5xtS4yzFTp9mavKUrEhgRQP5j4Yrs42J -G+5JzZaXT1eAx1Cbrkx8wk14DyMG82yyL4PqCArxN2rQI8C28yAv1AIPMFIkDKk/ -3rwJjmcsCln8D9mRBfIfUov1tNYwkd4ST0ByfdyhAoGAZcmdTDFY3ySYdCmtKLRZ -mzsDls4hY3N6aYBa21z+xiOhRg4crEus+36kG9ODjJetwyBpJ09OuM3mdlN86rLX -kIMmarlnBYblAuNQK6qE6t8gg0RDbLnHis/n15qsTg+AQvcQt4FP/tQjGd7DaKeu -DZdEt1N/MypTWmUw646okgECgYAgKQdkGQrpran+cXldwGAIPEWw+s0jx0ymZXfF -4b/zp069CZtI/NL7lUCiRw/FdEBN51Gm5ddjbJvQ/ceuSW7C/Lgrcz6EhGA+D3p5 -bcDlbDswH+7ueqPbo33+7cbx5oSUiG+uVZ5pSphCgElMez0EonGNh/e6aXFkZmht -h0P0wQKBgGtaHs54qwfmCcDgtg4taqGQ3xdyq2136BSNVdy83UbHzsFKu16D568i -2RY8K+n4ViISHvw5rbZsdQOll8HDQjCFqZ/2ueh8u/dKrKElZjicymFp7bojQ6+R -C55roLHTQNmgUU6hwtQSwuSn/3Si5NgLoTVP/G0DNg4nqaNQXhGm ------END RSA PRIVATE KEY----- diff --git a/tests/test_data/repo/keys/director/public.key b/tests/test_data/repo/keys/director/public.key deleted file mode 100644 index cb8b5afc5e..0000000000 --- a/tests/test_data/repo/keys/director/public.key +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxKtEgqt9VvDsLAbnP+Cc -qTmchCUyIuL1qNzRNOWrlo9XTuHTuP2EbfIOeyeh4dL83MU+75qFEg92X0X+cMN9 -DEdXYChsXk5oqQoZ8dwLkAfkaMn0sFeCDXAc4XG//OuagP+ZuHgd1O2GcS/VxLMJ -IQ+a7f1HnyCWEx5D3Cf9hH06pEwRxdR48OlcvTzBW9U0xDe35LWBk4SpfCVH5dhK -rrdF6WXV7S59IyreCwE2jmkv2i+qDqgBJJP6FD1KZKi8smknzKrLAlrwGMFU8Ljx -skOFaP+ywdHysJ5gqSO1AP3C5DztGDl0FlPe9RdqzvksRyCGXgk66vj7M13kyCEg -uQIDAQAB ------END PUBLIC KEY----- diff --git a/tests/test_data/repo/keys/image/key_type b/tests/test_data/repo/keys/image/key_type deleted file mode 100644 index 3605ceee18..0000000000 --- a/tests/test_data/repo/keys/image/key_type +++ /dev/null @@ -1 +0,0 @@ -"RSA2048" \ No newline at end of file diff --git a/tests/test_data/repo/keys/image/private.key b/tests/test_data/repo/keys/image/private.key deleted file mode 100644 index 305debb310..0000000000 --- a/tests/test_data/repo/keys/image/private.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA3wKhArnaDCisc8UKQlasLT0GYF4CZKxtsk4B0cOPQfqjuQbp -bOXFmgDhryKlzOPNHImpU8RdVbcOWr2cGKSfhQ4Oh5xK3lcNnW8r9iiyNIUxEyiq -n3hxQJPnPsfoVSKaBDA6ukK4awLXNC7SZVuijVKP+9iw25mjQheBa1do+MtMo2gZ -rOhAXiD3gnEabQ8c+Sxyd3INkQ3jBxF/g3jYWOlgjnSJpAoO8ZUHr1CeXEjycgQg -BB8FABy7kfvp5PW+i3NZZS1LEklP5b+Ow7xMAJNloPurjVGc29r0k7DZtpXmyrPD -HOIFcGOzB7oGGA8lMSAnSVwuA2JpJI3dpMR/nwIDAQABAoIBAF5II0AeyLOZQodT -R2oScIpToW1+cS6Uw2+9kQFY1ykCyNMBvBAA+FCKjN9ZG5WKvX2SKZczjm4djSEJ -xoOYnaRH9BabGf/z99qWVJSmUejoYn4CFFiFOAQgQ4SESZIspcadiUaTzJnZQpha -LzMQ0aFDxYGo8+RziNT5UQrLkqKTrkz65O6vpegnm/ihoSktFZghMhHlTfb9A818 -JXa4sZ6IMNEyLI6b+HTPXl/uAZi7VBe/BRikj5qviPr1A/jeWLD6Tfz/6oySaJ5R -8flLtOkbMSPpFE1KArOivxJ50+LCRjQXw4M47hppsOLTtsKJLKbzc96cy3lxtS6j -jncTiNECgYEA+76rNYUUPoq9LgonesOdXAZop+PgU0T5W39ogm6vEiok6Qu3CLg/ -w9Z0co8qJmU9lfdN3IQFLlXFyKhy9Og66NBV0fajWK3HE7Z6N144miLiyPidirVt -fUJdfFEFQQpkDGj3E319aKI8weZtPri0KhgpYKqQieTlwS9r38KRLEcCgYEA4sef -TDvRMV1xOFn1NpBbUnzS8TvdMpWGh2Ch/Emu3+wF0vqFkdc1eLImMs4LTwlIr4rJ -qK+MlQaAtvYn/3TqM2q43VHcNe3dOW8L1O6WA9AuRHcecCuuf0mcMaZY76OXW+hU -a+M+fxQY7Dp0IkJyCn+pF2kGQYWPxFQ4Ja6DtekCgYAfSnnZcysrAu+000pI9huP -HrTPeYGemAoul02UONHF/jsMRIqBqPU0EGn0+1qP3zGifFTPPhGuyraE1HtFecAo -xAyGxpNTKHaAOsRCMZHzhraNqGlcnmR3l1Ira56tkO8So9FiOMznvpKyv0OA8lBi -kxJBk7HXkf4E3zIXZAXLbQKBgGKRS06yLSGcsKpCh084/UhkErdhQqpKzVcoDCAA -0q5nAr0JwGZ8OLSGEg5A+i9XJK2P0EiuTJc1ZVqgsQ/afDTu7PzdKK6T/XSKLIVX -UgLESGffsm4kvkp67xWxbLRz0UTUPWVLNw266X47heCiKrkfdZpEPsDZ0XwO8vyF -1p+JAoGAXdNiFIXNBVPllxuboeZwdIWG/AAxeqOQ/CKjzZJV6ooZRDRG0cZ16T53 -hnbORSAAzKXrEdoG1UYlix5B9UKbz74dwlc15zo3a164HaE8wBcDlRMiopxmn8WM -7NZ93WvQHaRCB1cyxX63OyZxivU5I+IqKAFV4A2WCK/rvwNh4M4= ------END RSA PRIVATE KEY----- diff --git a/tests/test_data/repo/keys/image/public.key b/tests/test_data/repo/keys/image/public.key deleted file mode 100644 index 3b9dc93207..0000000000 --- a/tests/test_data/repo/keys/image/public.key +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3wKhArnaDCisc8UKQlas -LT0GYF4CZKxtsk4B0cOPQfqjuQbpbOXFmgDhryKlzOPNHImpU8RdVbcOWr2cGKSf -hQ4Oh5xK3lcNnW8r9iiyNIUxEyiqn3hxQJPnPsfoVSKaBDA6ukK4awLXNC7SZVui -jVKP+9iw25mjQheBa1do+MtMo2gZrOhAXiD3gnEabQ8c+Sxyd3INkQ3jBxF/g3jY -WOlgjnSJpAoO8ZUHr1CeXEjycgQgBB8FABy7kfvp5PW+i3NZZS1LEklP5b+Ow7xM -AJNloPurjVGc29r0k7DZtpXmyrPDHOIFcGOzB7oGGA8lMSAnSVwuA2JpJI3dpMR/ -nwIDAQAB ------END PUBLIC KEY----- diff --git a/tests/test_data/repo/repo/director/1.root.json b/tests/test_data/repo/repo/director/1.root.json deleted file mode 100644 index 3584e3b2f8..0000000000 --- a/tests/test_data/repo/repo/director/1.root.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d","method":"rsassa-pss","sig":"ic8qsSOvm2TCp02026qhc43Il46G2QPF+qCGmrOnNM1qEyg5jBqKMukMkAfS+daFOG3tQAU4Ex6jC0zySF6KTIl92lZOT9TOvXdt7/Xuvz0BFK7HDqPNa/zrQlkMbCQd+CpSUfuU3Xx/gzjtgS6KMuvSJsvIN8KXtQXUPns9Ftb1XgteKTkzW68B2iLhIpIjRcycJ/6VeIOxXNplb+EweRVh3NrCbUr5RDF0QCuurP84F5QkO9qej5wThF1JiS0qiKHCuRIm3n4nshbkAFKpWFHGD0ROv3vul8I1ct02KFt6IQfqgILjD3SBDg4LWitm6wNdok/I64LNHCeCRUBPzQ=="}],"signed":{"_type":"Root","expires":"2021-07-04T16:33:27Z","keys":{"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d":{"keytype":"RSA","keyval":{"public":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxKtEgqt9VvDsLAbnP+Cc\nqTmchCUyIuL1qNzRNOWrlo9XTuHTuP2EbfIOeyeh4dL83MU+75qFEg92X0X+cMN9\nDEdXYChsXk5oqQoZ8dwLkAfkaMn0sFeCDXAc4XG//OuagP+ZuHgd1O2GcS/VxLMJ\nIQ+a7f1HnyCWEx5D3Cf9hH06pEwRxdR48OlcvTzBW9U0xDe35LWBk4SpfCVH5dhK\nrrdF6WXV7S59IyreCwE2jmkv2i+qDqgBJJP6FD1KZKi8smknzKrLAlrwGMFU8Ljx\nskOFaP+ywdHysJ5gqSO1AP3C5DztGDl0FlPe9RdqzvksRyCGXgk66vj7M13kyCEg\nuQIDAQAB\n-----END PUBLIC KEY-----\n"}}},"roles":{"root":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"snapshot":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"targets":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"timestamp":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1}},"version":1}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/director/manifest b/tests/test_data/repo/repo/director/manifest deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/test_data/repo/repo/director/root.json b/tests/test_data/repo/repo/director/root.json deleted file mode 100644 index 3584e3b2f8..0000000000 --- a/tests/test_data/repo/repo/director/root.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d","method":"rsassa-pss","sig":"ic8qsSOvm2TCp02026qhc43Il46G2QPF+qCGmrOnNM1qEyg5jBqKMukMkAfS+daFOG3tQAU4Ex6jC0zySF6KTIl92lZOT9TOvXdt7/Xuvz0BFK7HDqPNa/zrQlkMbCQd+CpSUfuU3Xx/gzjtgS6KMuvSJsvIN8KXtQXUPns9Ftb1XgteKTkzW68B2iLhIpIjRcycJ/6VeIOxXNplb+EweRVh3NrCbUr5RDF0QCuurP84F5QkO9qej5wThF1JiS0qiKHCuRIm3n4nshbkAFKpWFHGD0ROv3vul8I1ct02KFt6IQfqgILjD3SBDg4LWitm6wNdok/I64LNHCeCRUBPzQ=="}],"signed":{"_type":"Root","expires":"2021-07-04T16:33:27Z","keys":{"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d":{"keytype":"RSA","keyval":{"public":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxKtEgqt9VvDsLAbnP+Cc\nqTmchCUyIuL1qNzRNOWrlo9XTuHTuP2EbfIOeyeh4dL83MU+75qFEg92X0X+cMN9\nDEdXYChsXk5oqQoZ8dwLkAfkaMn0sFeCDXAc4XG//OuagP+ZuHgd1O2GcS/VxLMJ\nIQ+a7f1HnyCWEx5D3Cf9hH06pEwRxdR48OlcvTzBW9U0xDe35LWBk4SpfCVH5dhK\nrrdF6WXV7S59IyreCwE2jmkv2i+qDqgBJJP6FD1KZKi8smknzKrLAlrwGMFU8Ljx\nskOFaP+ywdHysJ5gqSO1AP3C5DztGDl0FlPe9RdqzvksRyCGXgk66vj7M13kyCEg\nuQIDAQAB\n-----END PUBLIC KEY-----\n"}}},"roles":{"root":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"snapshot":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"targets":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1},"timestamp":{"keyids":["798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d"],"threshold":1}},"version":1}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/director/targets_hasupdates.json b/tests/test_data/repo/repo/director/targets_hasupdates.json deleted file mode 100644 index da914784ea..0000000000 --- a/tests/test_data/repo/repo/director/targets_hasupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d","method":"rsassa-pss","sig":"ck5pu2LPxFYs39d6eDauGseBHWwmHTE6VNJ2Ngs+Iu6zveFjYPf/IU6P/ucBkWC8MnlgswLZeIznXU/+ynSoL95W5wHWYDxKruzTOCYUmXJxTFK+q4cnnfOgvBmoDh35M889vrqFQtsp2SG8P6VIe4iPnb02wbopVcW4FcCLks+3idg8lk15W0Pm3yedkmu7ycJk8ZuY11V8Xrt4at+DCcsK+TD0YiKmbypsBDAkS+lyjYz7aYqyXiLf0r4RbdIaBs6SM+KxcXb0QQK5wDEe0vbek5WYTz6fp91PED/q5KkrN60LCnIxRKSxg5dT06GJqcejr59r80OwOj0okYrqGw=="}],"signed":{"_type":"Targets","custom":{"correlationId":"id0"},"expires":"2021-07-04T16:33:27Z","targets":{"primary_firmware.txt":{"custom":{"ecuIdentifiers":{"CA:FE:A6:D2:84:9D":{"hardwareId":"primary_hw"}}},"hashes":{"sha256":"74e653bbf6c00a88b21f0992159b1002f5af38506e6d2fbc7eb9846711b2d75f","sha512":"91814ad1c13ebe2af8d65044893633c4c3ce964edb8cb58b0f357406c255f7be94f42547e108b300346a42cd57662e4757b9d843b7acbc090df0bc05fe55297f"},"length":59},"secondary_firmware.txt":{"custom":{"ecuIdentifiers":{"secondary_ecu_serial":{"hardwareId":"secondary_hw"}}},"hashes":{"sha256":"1bbb15aa921ffffd5079567d630f43298dbe5e7cbc1b14e0ccdd6718fde28e47","sha512":"7dbae4c36a2494b731a9239911d3085d53d3e400886edb4ae2b9b78f40bda446649e83ba2d81653f614cc66f5dd5d4dbd95afba854f148afbfae48d0ff4cc38a"},"length":15}},"version":2}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/director/targets_multisec.json b/tests/test_data/repo/repo/director/targets_multisec.json deleted file mode 100644 index db24e6dba2..0000000000 --- a/tests/test_data/repo/repo/director/targets_multisec.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d","method":"rsassa-pss","sig":"muvbEur9wkgjhmR4rSJTn3DpNxAD0cWt5L3LMdc8rD0JRYsO1guhpBkMMebobPyN0fzGZOW95EKev2PjO639BjXlyqQcUTaEbGWeDtNxf/fRrUlA+KDSK1mY1fYHY4g+hJC0R/ArX+TXEb411p8oQ0vHn35vOEeLwLCDUk6Oc0Uis6HC3yo8EVBEAheQlg5nAcwm7fs0qDmaX1DpDaeLRG7xc78+2AsIqj29tjPNJQIk+775F0+NBWxuvIk88zU3XyLyW/9/Qzh1ntETziaa4WpTGQ+Y0pYCX7082osf221HyCGLbpjzfyUxqVYqobMvtxg6V9v6U3K4JvCoB+mzWA=="}],"signed":{"_type":"Targets","custom":{"correlationId":"id0"},"expires":"2021-07-04T16:33:27Z","targets":{"secondary_firmware.txt":{"custom":{"ecuIdentifiers":{"sec_serial1":{"hardwareId":"sec_hwid1"}}},"hashes":{"sha256":"1bbb15aa921ffffd5079567d630f43298dbe5e7cbc1b14e0ccdd6718fde28e47","sha512":"7dbae4c36a2494b731a9239911d3085d53d3e400886edb4ae2b9b78f40bda446649e83ba2d81653f614cc66f5dd5d4dbd95afba854f148afbfae48d0ff4cc38a"},"length":15},"secondary_firmware2.txt":{"custom":{"ecuIdentifiers":{"sec_serial2":{"hardwareId":"sec_hwid2"}}},"hashes":{"sha256":"d4954953d86ec6a5689f32373206a5fed4fd16679c5a910c406005d1348ecf95","sha512":"833ddc5138304cfb01513afb01a0d7fc78bcc605e59e70424214a7a4bff671e3e7c41f635710d22edbf234db84696c6806deb56a1e3e04db0bff1519727abb98"},"length":21}},"version":2}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/director/targets_noupdates.json b/tests/test_data/repo/repo/director/targets_noupdates.json deleted file mode 100644 index 723d8351e8..0000000000 --- a/tests/test_data/repo/repo/director/targets_noupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"798f4a19aa185f97c3c119e78f251cc30f293b226c3dc1ccd8694f15b1f36d5d","method":"rsassa-pss","sig":"M0EijmAd0tzslOTrW4d8/rVS+Vve5naoJa6Jj+9LaEDGT+CsnR4ElGYdJnXUWcswx9k2NLeO+FeHyXbxvDOHNCFds4XvJAoK9reSKi+tID4HgoSdK1C5Le3bR25L9VnuBRSqA6bCfiL8maHRAzK6lvGDTq7r1seSZe5yMcBv5ybQkLtWW4BuMq3dkhDGx8vXI52GOE2GMp62pEswj28BeBE8YubkjyVGczI6nYnun2yRglbmrfA6BB5joRnSwX3EvdavarlaIUcx1gvTSkcHQ+weSQ4c/QPKYA2fz7CHNRxo0+w+PKQbvSUjkwBLjxEkQ/0HPhDdiBybkbOitPLWcA=="}],"signed":{"_type":"Targets","custom":{"correlationId":"id0"},"expires":"2021-07-04T16:33:27Z","targets":{},"version":1}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/1.root.json b/tests/test_data/repo/repo/image/1.root.json deleted file mode 100644 index 79974a1f2f..0000000000 --- a/tests/test_data/repo/repo/image/1.root.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"SlBn0tWk9H5vg1zcqYJO7zD7LXHndoRzy4ANWGdqZFGT4o2XkYhEdGElVBI1zSQQq2wZltaovT0LPxr24jiC9pbNGMgETNHakNEKnqtVPcHhxgxcvyHuCXwHbprr98yQQqdGdFIPoBPKImcDz7qp+up1MVPnflgN2Kq5PGkL7SynoJueVXATNHaFP4Ph6EW1NgFBVY26q5K0dqvYii1v2Ga8veMLvWM+bo199rN/LLwOY3cRJpVn5Sy1CvtWGHBPqIz2TIwTrwE/vjG2jLGHtTI9TXfDpDG0HyMiX0UDYI5OEpolwMg4o3BUEyaAo11BaZGRHvO3oxfrf6zH8UppHg=="}],"signed":{"_type":"Root","expires":"2021-07-04T16:33:27Z","keys":{"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4":{"keytype":"RSA","keyval":{"public":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3wKhArnaDCisc8UKQlas\nLT0GYF4CZKxtsk4B0cOPQfqjuQbpbOXFmgDhryKlzOPNHImpU8RdVbcOWr2cGKSf\nhQ4Oh5xK3lcNnW8r9iiyNIUxEyiqn3hxQJPnPsfoVSKaBDA6ukK4awLXNC7SZVui\njVKP+9iw25mjQheBa1do+MtMo2gZrOhAXiD3gnEabQ8c+Sxyd3INkQ3jBxF/g3jY\nWOlgjnSJpAoO8ZUHr1CeXEjycgQgBB8FABy7kfvp5PW+i3NZZS1LEklP5b+Ow7xM\nAJNloPurjVGc29r0k7DZtpXmyrPDHOIFcGOzB7oGGA8lMSAnSVwuA2JpJI3dpMR/\nnwIDAQAB\n-----END PUBLIC KEY-----\n"}}},"roles":{"root":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"snapshot":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"targets":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"timestamp":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1}},"version":1}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/root.json b/tests/test_data/repo/repo/image/root.json deleted file mode 100644 index 79974a1f2f..0000000000 --- a/tests/test_data/repo/repo/image/root.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"SlBn0tWk9H5vg1zcqYJO7zD7LXHndoRzy4ANWGdqZFGT4o2XkYhEdGElVBI1zSQQq2wZltaovT0LPxr24jiC9pbNGMgETNHakNEKnqtVPcHhxgxcvyHuCXwHbprr98yQQqdGdFIPoBPKImcDz7qp+up1MVPnflgN2Kq5PGkL7SynoJueVXATNHaFP4Ph6EW1NgFBVY26q5K0dqvYii1v2Ga8veMLvWM+bo199rN/LLwOY3cRJpVn5Sy1CvtWGHBPqIz2TIwTrwE/vjG2jLGHtTI9TXfDpDG0HyMiX0UDYI5OEpolwMg4o3BUEyaAo11BaZGRHvO3oxfrf6zH8UppHg=="}],"signed":{"_type":"Root","expires":"2021-07-04T16:33:27Z","keys":{"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4":{"keytype":"RSA","keyval":{"public":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3wKhArnaDCisc8UKQlas\nLT0GYF4CZKxtsk4B0cOPQfqjuQbpbOXFmgDhryKlzOPNHImpU8RdVbcOWr2cGKSf\nhQ4Oh5xK3lcNnW8r9iiyNIUxEyiqn3hxQJPnPsfoVSKaBDA6ukK4awLXNC7SZVui\njVKP+9iw25mjQheBa1do+MtMo2gZrOhAXiD3gnEabQ8c+Sxyd3INkQ3jBxF/g3jY\nWOlgjnSJpAoO8ZUHr1CeXEjycgQgBB8FABy7kfvp5PW+i3NZZS1LEklP5b+Ow7xM\nAJNloPurjVGc29r0k7DZtpXmyrPDHOIFcGOzB7oGGA8lMSAnSVwuA2JpJI3dpMR/\nnwIDAQAB\n-----END PUBLIC KEY-----\n"}}},"roles":{"root":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"snapshot":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"targets":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1},"timestamp":{"keyids":["5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4"],"threshold":1}},"version":1}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/snapshot_hasupdates.json b/tests/test_data/repo/repo/image/snapshot_hasupdates.json deleted file mode 100644 index 36e54da66b..0000000000 --- a/tests/test_data/repo/repo/image/snapshot_hasupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"hDz2mLMP0VOS4jryWzcLONE3SgNnddyRi7okWDdhe/y1TL2pj3w4uYIqUzdyJX1Af6uf6NJO4xcv/7A3hmtH72KM+Zh+yZEyzm1NWZwSkUznFBxccDhAKWFQXlC7LJ/XQHokK9+jEv95rDbNusROM+CaZbZ5NvXvoj/ZFTt+Dt6SPshxBVjBYwo/9QnxsnXZ9AOYwCoPTg+tWBHHOBTn+OHG63f3i66ROFG5OiKPiUrxUmFApyfsZm3QLrsi+YVp0QrwW9iPUTNc1t50psky9GmV/FwXTcTCJiOtvCPt8QhbD8/jgFXW5NDzgi6ANhUJPyDjONDbr3h768LHozMS9g=="}],"signed":{"_type":"Snapshot","expires":"2021-07-04T16:33:27Z","meta":{"root.json":{"hashes":{"sha256":"8a81c5212c6cb67ad418480c6932b855cf14a27d9547b2723e2feb783c972f01","sha512":"562840713fd4049db2c1d6681e860b4e7eae8d5017af3221c44e00cc27c4e677a13f73d2bea4dbada3946da9daeaec265de909fefc6ff33a45d09bfef5582df0"},"length":1542,"version":1},"targets.json":{"hashes":{"sha256":"1010135a632ee394e6e0d194299466c169780c7bf4754d9b6708ee473dbce614","sha512":"22c07f4bda28859b9b3e80901da46febce4287cc4a259a909a0d400e30aa9f06afa8ad4b9d9dcfe140aaefafae7c60909d37a73ae9caf7682570d027c0749470"},"length":1346,"version":4}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/snapshot_multisec.json b/tests/test_data/repo/repo/image/snapshot_multisec.json deleted file mode 100644 index 5f32d935a2..0000000000 --- a/tests/test_data/repo/repo/image/snapshot_multisec.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"POSAnJbFAuwZNDSfc5ZGZ1+w821HGx++41MsWv68l7H3Q/+hrL4nBqv94VeK90pQW6BcHrZFWYrFlNKU6bAFfGCXxHbCC9kIZggNmCo7cr6o3BlrKXISL03fl7iZMAbBw+UbZOufNeuIiI3N4sfM5uehHcDo77mqeq+bRgtY9y5XL1Ll2Yf13p4Db/CTZc8kxCv5n8pWe5pKvZt4U+z+LsxaKp5Dt0C6+Rv88CBzl6t/V+KH/Ku5dIckP4R0NzLtXSyCUAx4Pqxmb0mJKpGZIE18oLYAhehfwJM9u7BkJjKaidjQg4zSa4o755Gr3Ue4jSMxX8xXS1bC4utAEShHNA=="}],"signed":{"_type":"Snapshot","expires":"2021-07-04T16:33:27Z","meta":{"root.json":{"hashes":{"sha256":"8a81c5212c6cb67ad418480c6932b855cf14a27d9547b2723e2feb783c972f01","sha512":"562840713fd4049db2c1d6681e860b4e7eae8d5017af3221c44e00cc27c4e677a13f73d2bea4dbada3946da9daeaec265de909fefc6ff33a45d09bfef5582df0"},"length":1542,"version":1},"targets.json":{"hashes":{"sha256":"a999b6f486ce962110635445992c20d3552e45052227bd7d5cae5529d3ab2456","sha512":"918460b2a3137b13a1f1c89c83db7e3a90f8f9dd9f62fedf382f90da36a493623ac257e6f42914adfeba76daa2e46841aa89ee2f3e002b78c525a1457a0af368"},"length":1349,"version":4}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/snapshot_noupdates.json b/tests/test_data/repo/repo/image/snapshot_noupdates.json deleted file mode 100644 index 2bbdc37ca3..0000000000 --- a/tests/test_data/repo/repo/image/snapshot_noupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"VOhaIIDd/R3z90AAI9W3rpA7IpD9mQGm6c8ZysknK9+A3w3UPKD114D4/Z2vjSErCuCzRlFOuv5lthqp8pes5FaQIqZkN3WC7D2QYA73R3lnt21hP4v0S/VOiWrI2JOKSMRKbyI3J2+/ZXtnzZwqMPCyGKqoDdFTSDPuKd5IWHqhHwNoyCfcGbVUSmDZX8TzIfmPAjvhKbPdYxAYgFmjOkbZ/18lcq22d/CBubS0bIDDgEwPx7SolZ1QMtvLRyGWLL/Mm5fLMCr7zG8lGZrczArQLesJHM6BM4xGFygUFk7zxpWVsifmdo4+PwwH93eaXlCDW7zePzYO9g3VY9nGGw=="}],"signed":{"_type":"Snapshot","expires":"2021-07-04T16:33:27Z","meta":{"root.json":{"hashes":{"sha256":"8a81c5212c6cb67ad418480c6932b855cf14a27d9547b2723e2feb783c972f01","sha512":"562840713fd4049db2c1d6681e860b4e7eae8d5017af3221c44e00cc27c4e677a13f73d2bea4dbada3946da9daeaec265de909fefc6ff33a45d09bfef5582df0"},"length":1542,"version":1},"targets.json":{"hashes":{"sha256":"72a37d306549841b7167d321cb0fde40e3473f25e3457a3823c9746ba05c3b3e","sha512":"169f73b84bac61cc485dd185723409aaad0b1ba080bd2bb6cb9ced3b6ba46111827f29d4965dd97dac538fe7a6da74353ac9dfbe29405630b924c8b5d3d24d22"},"length":816,"version":2}},"version":2}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/targets/dummy_firmware.txt b/tests/test_data/repo/repo/image/targets/dummy_firmware.txt deleted file mode 100644 index be43fcaec4..0000000000 --- a/tests/test_data/repo/repo/image/targets/dummy_firmware.txt +++ /dev/null @@ -1 +0,0 @@ -Just to increment timestamp, ignore it diff --git a/tests/test_data/repo/repo/image/targets/primary_firmware.txt b/tests/test_data/repo/repo/image/targets/primary_firmware.txt deleted file mode 100644 index 395de61b78..0000000000 --- a/tests/test_data/repo/repo/image/targets/primary_firmware.txt +++ /dev/null @@ -1 +0,0 @@ -This is a dummy firmware file (should never be downloaded) diff --git a/tests/test_data/repo/repo/image/targets/secondary_firmware.txt b/tests/test_data/repo/repo/image/targets/secondary_firmware.txt deleted file mode 100644 index 954517c864..0000000000 --- a/tests/test_data/repo/repo/image/targets/secondary_firmware.txt +++ /dev/null @@ -1 +0,0 @@ -This is content \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/targets/secondary_firmware2.txt b/tests/test_data/repo/repo/image/targets/secondary_firmware2.txt deleted file mode 100644 index 1c170a77b1..0000000000 --- a/tests/test_data/repo/repo/image/targets/secondary_firmware2.txt +++ /dev/null @@ -1 +0,0 @@ -This is more content diff --git a/tests/test_data/repo/repo/image/targets_hasupdates.json b/tests/test_data/repo/repo/image/targets_hasupdates.json deleted file mode 100644 index 00963fef2e..0000000000 --- a/tests/test_data/repo/repo/image/targets_hasupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"p0w2rsUeZ3tEtAvgRsVkE/j9w1PT8XU+PGsrYrO8UYTorLE2U9zvQkSAy5YIDORIWAXUpZ386dXjDhpkQ63ItTtkz8QfYdXGM5vvFtm5g/dTezWG72SWJ78Oz/L91atyCHn2sIZVGRROtDqNwTG4l/wxmbWN/yjIQXJVdif2bxSCC+iQxNNhXq9HlJtgIUkTuOCdmiEo2fw8vNgHVbpjUJZUSJ5UxgVnENz44T+YPusA+Aeh/AqDO7JjZdBBb/PGTp8D54EMcyHYmzESBvIhydH7DgLu5ExnRVmg/0HtGljkQrOx5OKp45TiwsyBIeM2+Dq+UJQEueFUj3/mGwjsMg=="}],"signed":{"_type":"Targets","expires":"2021-07-04T16:33:27Z","targets":{"dummy_firmware.txt":{"hashes":{"sha256":"8ab755c16de6ee9b6224169b36cbf0f2a545f859be385501ad82cdccc240d0a6","sha512":"fa49cac70102f1ae2a617727f4d1b5d44ccccad7fda1fe6b07c111b6e26769f51aa33af22ff27314f8dc80c5500221d07baeeebb9b868a822229d1036cd6d1ab"},"length":39},"primary_firmware.txt":{"hashes":{"sha256":"74e653bbf6c00a88b21f0992159b1002f5af38506e6d2fbc7eb9846711b2d75f","sha512":"91814ad1c13ebe2af8d65044893633c4c3ce964edb8cb58b0f357406c255f7be94f42547e108b300346a42cd57662e4757b9d843b7acbc090df0bc05fe55297f"},"length":59},"secondary_firmware.txt":{"hashes":{"sha256":"1bbb15aa921ffffd5079567d630f43298dbe5e7cbc1b14e0ccdd6718fde28e47","sha512":"7dbae4c36a2494b731a9239911d3085d53d3e400886edb4ae2b9b78f40bda446649e83ba2d81653f614cc66f5dd5d4dbd95afba854f148afbfae48d0ff4cc38a"},"length":15}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/targets_multisec.json b/tests/test_data/repo/repo/image/targets_multisec.json deleted file mode 100644 index 389491c4bd..0000000000 --- a/tests/test_data/repo/repo/image/targets_multisec.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"wfVEGXql3OJlgoF5MZxdkRPbi/sasJaLgHtNNeEV6/9K5O9Cse0iZ6DKzs2irfwI/oYIARKmHQI5vAHZ/zGRzLxcGmxDOOb5TUb0NIZJWJM0B+tKVMgWTbNvLdPl8h4FcsNP0vLg0Ou9mEE4t/dW1BhtND7i2f/n3bhimjwG8xL3RNHzLkH3bGaJsrzWo4SPh6Jff6jEbiGEp9rHXbHLCIvRlU5TPydpeFfdr1Y7tmy90zU8r/L4ILkIKc2IgsNMoxpJxRP2VIILyXhoYMRqm3aszmrMoAqce0Uqlgpto1K4mxvcWeIDZXKhmESONDgrT0kI9IArS+XAi76jYEs8Zw=="}],"signed":{"_type":"Targets","expires":"2021-07-04T16:33:27Z","targets":{"dummy_firmware.txt":{"hashes":{"sha256":"8ab755c16de6ee9b6224169b36cbf0f2a545f859be385501ad82cdccc240d0a6","sha512":"fa49cac70102f1ae2a617727f4d1b5d44ccccad7fda1fe6b07c111b6e26769f51aa33af22ff27314f8dc80c5500221d07baeeebb9b868a822229d1036cd6d1ab"},"length":39},"secondary_firmware.txt":{"hashes":{"sha256":"1bbb15aa921ffffd5079567d630f43298dbe5e7cbc1b14e0ccdd6718fde28e47","sha512":"7dbae4c36a2494b731a9239911d3085d53d3e400886edb4ae2b9b78f40bda446649e83ba2d81653f614cc66f5dd5d4dbd95afba854f148afbfae48d0ff4cc38a"},"length":15},"secondary_firmware2.txt":{"hashes":{"sha256":"d4954953d86ec6a5689f32373206a5fed4fd16679c5a910c406005d1348ecf95","sha512":"833ddc5138304cfb01513afb01a0d7fc78bcc605e59e70424214a7a4bff671e3e7c41f635710d22edbf234db84696c6806deb56a1e3e04db0bff1519727abb98"},"length":21}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/targets_noupdates.json b/tests/test_data/repo/repo/image/targets_noupdates.json deleted file mode 100644 index 243cb21c18..0000000000 --- a/tests/test_data/repo/repo/image/targets_noupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"wLFxMKFQYBE15UbM4CM/Lz/M9+Yjr/gEmBS0czgHANzT4Z0+jrHAMNzggwmmP+AlAFKdC7Z0fJLqn/B4AL5jF/A+m7+6g971yRrMZrktRjyZfxLhJ5In6U1O0cN6GuaXez4rCS7E9GgHx01FDPihROiqN+AUYIAVGScLz/x7a0gCJ0FSoEAy174wAANejJK9ZZIFEAjsf/38FZIE2dNJnZICuF4VREpXjhBacIoBbfvQ+u7aoHWGOFpvPAPR0XvkWuf+uFMLItM9TFMnLDAPSNntkGVtzYFzLnXS4A/5KsWoE3ncb4CRWgH8oZ5ewEd7fFq/ykRKGK1EUwc95RTOKw=="}],"signed":{"_type":"Targets","expires":"2021-07-04T16:33:27Z","targets":{"dummy_firmware.txt":{"hashes":{"sha256":"8ab755c16de6ee9b6224169b36cbf0f2a545f859be385501ad82cdccc240d0a6","sha512":"fa49cac70102f1ae2a617727f4d1b5d44ccccad7fda1fe6b07c111b6e26769f51aa33af22ff27314f8dc80c5500221d07baeeebb9b868a822229d1036cd6d1ab"},"length":39}},"version":2}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/timestamp_hasupdates.json b/tests/test_data/repo/repo/image/timestamp_hasupdates.json deleted file mode 100644 index 70ffc5aa0d..0000000000 --- a/tests/test_data/repo/repo/image/timestamp_hasupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"l2g7z3hoJFW3Eg4RStcXo8kVf8JlHAEihaQNS1KAk5+vaOk8WFPr5/CoCC/v/2Wgtz1ssSyC18aRPjsuf8yiDZ8BwVqvb+2ZIxEKUUG6+hmsXK3iEXNmz2ZLER4PKSk0IiB6RjavAyUMmNhfghnFNk8/DH43CyXQmd1WTRCG75O09QpRdd7vB3lDq9qvx1nbKyYTWJnEyhS8SI7Ya7Vuqzo9xS2JaLvkgQUzVcK8IZ1i4com2SL9AkuC29FLq6U7r1OO2R4v6QmiWP7V0BTEj27ydEDi104nck8xkT+c3oSySY09/xKHkFVsVecWvp9gQsPveJpdnzjGYhIUzLvtHw=="}],"signed":{"_type":"Timestamp","expires":"2021-07-04T16:33:27Z","meta":{"snapshot.json":{"hashes":{"sha256":"2cf8b81b41f9a9aca212e1c3c2c3a1f494a7f638fc62aaaa3b8193c6fce3cf5e","sha512":"c7cf379d8ee4698c8d6c426ec7f3be06a63abef75db1e53030637e70634825878bc6d0c4b7f3344a65d6ed05b9b35c4914ddaf1032ee94b12957dc1308893c50"},"length":1089,"version":4}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/timestamp_multisec.json b/tests/test_data/repo/repo/image/timestamp_multisec.json deleted file mode 100644 index fe11d7509e..0000000000 --- a/tests/test_data/repo/repo/image/timestamp_multisec.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"2uI2j8kVdvS5ZQKvSVt3sWDTrBgehBtCSxsW4S0yRs5gjnSfvxvC5cTHXaPv7Vb520pL4mm1ODzCGriI00V9JxrSrHSrG1MshafqDP2vArQ6DXROfhfNPoZ5PAv/tQQYI8RBbx6xGFFjFKfVGCSM++qpagSIJd1bLbc3mTj9XyuVS1YT4YR+5u3I20F1dduI3N5davp7is29yeaj8o4++lSfnism/sxc5Yp13Ic0khMn7duki8oKIiytdd5QgZ0JEJPJpn5GfrFh66ygdTLESRrSFWbFL+i6Hjccc2bETlg6IuIerSeZplhlaQOiHoAoxP5aRudz4ITh8MfK6ZGhyQ=="}],"signed":{"_type":"Timestamp","expires":"2021-07-04T16:33:27Z","meta":{"snapshot.json":{"hashes":{"sha256":"8a5003a693cf0b7a6581a82d5da05d838d7a841b5f99d20c42f20b5d6c820448","sha512":"a5c6d68a32e52d2f60cbb5977cf71c334deefce90783033b518d24c2bc1cef626d9b43ab2b81c5c7b513800b01f0cf17f338e8a9280da283a414c2bf374f37e1"},"length":1089,"version":4}},"version":4}} \ No newline at end of file diff --git a/tests/test_data/repo/repo/image/timestamp_noupdates.json b/tests/test_data/repo/repo/image/timestamp_noupdates.json deleted file mode 100644 index 0055db650d..0000000000 --- a/tests/test_data/repo/repo/image/timestamp_noupdates.json +++ /dev/null @@ -1 +0,0 @@ -{"signatures":[{"keyid":"5efd9a80be20c9e7583e680cab88537ad9cfc04f62864b3a8ce1321de76f38b4","method":"rsassa-pss","sig":"smJCTHTCNGxpp34G1EP+gYU7/JXjpz23lNGzrVWxXlqZT9Kc6k0EynE89k4gcGc+kGsn6qtwqVhw2CQm0j8XapPL/PLP1PUsI7HDWxxt8Irog6nUw9lmny05QKI0ISLdWU3Hg2V1t6grZeedvPgHqRoGihEA93nHpX9VSf706x3JRcVJJtAgU936i3kzC7CxYy3v2QwV8dYfmx9j61cZ6labiuopgzB9dchuBCb4mfU197P2ZiVpXEFNIBTnK1vRFqS0059g+TfCE/WfmrVkrZx31ysxv3yPEN80ESqmbieugxuXkJpa0xePavMEeFkJmv6VZZO6ToqV78612Uazmg=="}],"signed":{"_type":"Timestamp","expires":"2021-07-04T16:33:27Z","meta":{"snapshot.json":{"hashes":{"sha256":"8df3d2f92cd0ea7fb3181d71a4a1fe1af55ad0f6854e43c9c81620b46f3e406c","sha512":"1cf7ccda93e459dc2db36f532a87680e1943d97db089f497a0a63910088111aad1e49360b743ea340fa2aeec5c4aab68c1f36b8a2898c09da1ae4064634c2d5a"},"length":1088,"version":2}},"version":2}} \ No newline at end of file