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

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

Merge "KeyMint VTS: option to skip BOOT_PATCHLEVEL check" am: 8aeb7ef2 am:... 

Merge "KeyMint VTS: option to skip BOOT_PATCHLEVEL check" am: 8aeb7ef2 am: 8a2977f6 am: 4f6428aa

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

Change-Id: Ie04a421c549a5416aaf998bec27fb807c5ee802f
parents 8b035f0e 4f6428aa

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

+17 −3
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ namespace aidl::android::hardware::security::keymint::test { 


namespace {



// Whether to check that BOOT_PATCHLEVEL is populated.

bool check_boot_pl = true;



// The maximum number of times we'll attempt to verify that corruption

// of an encrypted blob results in an error. Retries are necessary as there

// is a small (roughly 1/256) chance that corrupting ciphertext still results
@@ -527,12 +530,17 @@ class NewKeyGenerationTest : public KeyMintAidlTestBase { 
        EXPECT_TRUE(os_pl);

        EXPECT_EQ(*os_pl, os_patch_level());



        // Should include vendor and boot patchlevels.

        // Should include vendor patchlevel.

        auto vendor_pl = auths.GetTagValue(TAG_VENDOR_PATCHLEVEL);

        EXPECT_TRUE(vendor_pl);

        EXPECT_EQ(*vendor_pl, vendor_patch_level());



        // Should include boot patchlevel (but there are some test scenarios where this is not

        // possible).

        if (check_boot_pl) {

            auto boot_pl = auths.GetTagValue(TAG_BOOT_PATCHLEVEL);

            EXPECT_TRUE(boot_pl);

        }



        return auths;

    }
@@ -6871,6 +6879,12 @@ int main(int argc, char** argv) { 
            } else {

                std::cout << "NOT dumping attestations" << std::endl;

            }

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

                // Allow checks of BOOT_PATCHLEVEL to be disabled, so that the tests can

                // be run in emulated environments that don't have the normal bootloader

                // interactions.

                aidl::android::hardware::security::keymint::test::check_boot_pl = false;

            }

        }

    }

    return RUN_ALL_TESTS();