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

Commit b21e6df7 authored by Tri Vo's avatar Tri Vo
Browse files

Enforce boot and vendor patch level format always 

Test: atest VtsAidlKeyMintTargetTest
Change-Id: I80bc96a6aee62474b33b015b6d04de7527fe757c
parent 249640be

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

+26 −31
Original line number Diff line number Diff line
@@ -1743,10 +1743,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) {
@@ -1776,7 +1772,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