Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e282d82c authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "KeyMint VTS: fix flipped error messages" into main am: e016befb am:... 

Merge "KeyMint VTS: fix flipped error messages" into main am: e016befb am: da8d5277 am: 05cd4def

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2895123



Change-Id: Idcae5d29dfeaa4e4bd311eb81ac708cd0ba6c373
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f8f8cc1 05cd4def

security/keymint/aidl/vts/functional/KeyBlobUpgradeTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ class KeyBlobUpgradeTest : public KeyMintAidlTestBase { 


                if (upgraded_keyblob.empty()) {

                    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 {

                    // Ensure the old format keyblob is deleted (so any secure deletion data is

                    // cleaned up).
@@ -275,8 +276,7 @@ class KeyBlobUpgradeTest : public KeyMintAidlTestBase { 
                    save_keyblob(subdir, name, upgraded_keyblob, key_characteristics);

                    // Cert file is left unchanged.

                    std::cerr << "Keyblob '" << name << "' upgraded\n";

                    EXPECT_TRUE(expectUpgrade)

                            << "Keyblob '" << name << "' unexpectedly left as-is";

                    EXPECT_TRUE(expectUpgrade) << "Keyblob '" << name << "' unexpectedly upgraded";

                }

            }

        }

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+17 −13
Original line number Diff line number Diff line
@@ -8796,10 +8796,11 @@ INSTANTIATE_KEYMINT_AIDL_TEST(VsrRequirementTest); 


}  // namespace aidl::android::hardware::security::keymint::test



using aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase;



int main(int argc, char** argv) {

    std::cout << "Testing ";

    auto halInstances =

            aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::build_params();

    auto halInstances = KeyMintAidlTestBase::build_params();

    std::cout << "HAL instances:\n";

    for (auto& entry : halInstances) {

        std::cout << "    " << entry << '\n';
@@ -8809,12 +8810,10 @@ int main(int argc, char** argv) { 
    for (int i = 1; i < argc; ++i) {

        if (argv[i][0] == '-') {

            if (std::string(argv[i]) == "--arm_deleteAllKeys") {

                aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::

                        arm_deleteAllKeys = true;

                KeyMintAidlTestBase::arm_deleteAllKeys = true;

            }

            if (std::string(argv[i]) == "--dump_attestations") {

                aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::

                        dump_Attestations = true;

                KeyMintAidlTestBase::dump_Attestations = true;

            } else {

                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";

                    return 1;

                }

                aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::keyblob_dir =

                        std::string(argv[i + 1]);

                KeyMintAidlTestBase::keyblob_dir = std::string(argv[i + 1]);

                ++i;

            }

            if (std::string(argv[i]) == "--expect_upgrade") {
@@ -8839,11 +8837,17 @@ int main(int argc, char** argv) { 
                    return 1;

                }

                std::string arg = argv[i + 1];

                aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::

                        expect_upgrade =

                                arg == "yes"

                                        ? true

                KeyMintAidlTestBase::expect_upgrade =

                        arg == "yes" ? true

                                     : (arg == "no" ? false : std::optional<bool>(std::nullopt));

                if (KeyMintAidlTestBase::expect_upgrade.has_value()) {

                    std::cout << "expect_upgrade = "

                              << (KeyMintAidlTestBase::expect_upgrade.value() ? "true" : "false")

                              << std::endl;

                } else {

                    std::cerr << "Error! Option --expect_upgrade " << arg << " unrecognized"

                              << std::endl;

                }

                ++i;

            }

        }