Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "KeyMint VTS: fix flipped error messages" into main

Browse Source
This commit is contained in:
David Drysdale
2024-01-04 09:56:25 +00:00
committed by Gerrit Code Review
parent e3ed739865 77a86d8dae
commit e016befb4f
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/keymint/aidl/vts/functional/KeyBlobUpgradeTest.cpp
View File

@@ -258,7 +258,8 @@ class KeyBlobUpgradeTest : public KeyMintAidlTestBase {
if (upgraded_keyblob.empty()) { if (upgraded_keyblob.empty()) {
std::cerr << "Keyblob '" << name << "' did not require upgrade\n"; std::cerr << "Keyblob '" << name << "' did not require upgrade\n";
EXPECT_TRUE(!expectUpgrade) << "Keyblob '" << name << "' unexpectedly upgraded"; EXPECT_FALSE(expectUpgrade)
<< "Keyblob '" << name << "' unexpectedly left as-is";
} else { } else {
// Ensure the old format keyblob is deleted (so any secure deletion data is // Ensure the old format keyblob is deleted (so any secure deletion data is
// cleaned up). // cleaned up).
@@ -275,8 +276,7 @@ class KeyBlobUpgradeTest : public KeyMintAidlTestBase {
save_keyblob(subdir, name, upgraded_keyblob, key_characteristics); save_keyblob(subdir, name, upgraded_keyblob, key_characteristics);
// Cert file is left unchanged. // Cert file is left unchanged.
std::cerr << "Keyblob '" << name << "' upgraded\n"; std::cerr << "Keyblob '" << name << "' upgraded\n";
EXPECT_TRUE(expectUpgrade) EXPECT_TRUE(expectUpgrade) << "Keyblob '" << name << "' unexpectedly upgraded";
<< "Keyblob '" << name << "' unexpectedly left as-is";
} }
} }
} }

30
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View File

@@ -8796,10 +8796,11 @@ INSTANTIATE_KEYMINT_AIDL_TEST(VsrRequirementTest);
} // namespace aidl::android::hardware::security::keymint::test } // namespace aidl::android::hardware::security::keymint::test
using aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase;
int main(int argc, char** argv) { int main(int argc, char** argv) {
std::cout << "Testing "; std::cout << "Testing ";
auto halInstances = auto halInstances = KeyMintAidlTestBase::build_params();
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::build_params();
std::cout << "HAL instances:\n"; std::cout << "HAL instances:\n";
for (auto& entry : halInstances) { for (auto& entry : halInstances) {
std::cout << " " << entry << '\n'; std::cout << " " << entry << '\n';
@@ -8809,12 +8810,10 @@ int main(int argc, char** argv) {
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
if (std::string(argv[i]) == "--arm_deleteAllKeys") { if (std::string(argv[i]) == "--arm_deleteAllKeys") {
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase:: KeyMintAidlTestBase::arm_deleteAllKeys = true;
arm_deleteAllKeys = true;
} }
if (std::string(argv[i]) == "--dump_attestations") { if (std::string(argv[i]) == "--dump_attestations") {
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase:: KeyMintAidlTestBase::dump_Attestations = true;
dump_Attestations = true;
} else { } else {
std::cout << "NOT dumping attestations" << std::endl; std::cout << "NOT dumping attestations" << std::endl;
} }
@@ -8829,8 +8828,7 @@ int main(int argc, char** argv) {
std::cerr << "Missing argument for --keyblob_dir\n"; std::cerr << "Missing argument for --keyblob_dir\n";
return 1; return 1;
} }
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::keyblob_dir = KeyMintAidlTestBase::keyblob_dir = std::string(argv[i + 1]);
std::string(argv[i + 1]);
++i; ++i;
} }
if (std::string(argv[i]) == "--expect_upgrade") { if (std::string(argv[i]) == "--expect_upgrade") {
@@ -8839,11 +8837,17 @@ int main(int argc, char** argv) {
return 1; return 1;
} }
std::string arg = argv[i + 1]; std::string arg = argv[i + 1];
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase:: KeyMintAidlTestBase::expect_upgrade =
expect_upgrade = arg == "yes" ? true
arg == "yes" : (arg == "no" ? false : std::optional<bool>(std::nullopt));
? true if (KeyMintAidlTestBase::expect_upgrade.has_value()) {
: (arg == "no" ? false : std::optional<bool>(std::nullopt)); std::cout << "expect_upgrade = "
<< (KeyMintAidlTestBase::expect_upgrade.value() ? "true" : "false")
<< std::endl;
} else {
std::cerr << "Error! Option --expect_upgrade " << arg << " unrecognized"
<< std::endl;
}
++i; ++i;
} }
} }