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

Commit 002d4a1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enforce boot and vendor patch level format always" am: efd4cf71 am:... 

Merge "Enforce boot and vendor patch level format always" am: efd4cf71 am: 6cff83c7 am: 68334663 am: dd9febd1

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



Change-Id: I25fa4accc778b1a42fbebeefb9376b392889cbe9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34c52959 dd9febd1

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

+26 −31
Original line number Diff line number Diff line
@@ -1751,10 +1751,6 @@ bool verify_attestation_record(int32_t aidl_version, // 
    EXPECT_EQ(security_level, att_keymint_security_level);

    EXPECT_EQ(security_level, att_attestation_security_level);



    // TODO(b/136282179): When running under VTS-on-GSI the TEE-backed

    // keymint implementation will report YYYYMM dates instead of YYYYMMDD

    // for the BOOT_PATCH_LEVEL.

    if (avb_verification_enabled()) {

    for (int i = 0; i < att_hw_enforced.size(); i++) {

        if (att_hw_enforced[i].tag == TAG_BOOT_PATCHLEVEL ||

            att_hw_enforced[i].tag == TAG_VENDOR_PATCHLEVEL) {
@@ -1784,7 +1780,6 @@ bool verify_attestation_record(int32_t aidl_version, // 
            EXPECT_LT(time.tm_year, 200);

        }

    }

    }



    // Check to make sure boolean values are properly encoded. Presence of a boolean tag

    // indicates true. A provided boolean tag that can be pulled back out of the certificate