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

Commit e9dcae53 authored by David Drysdale's avatar David Drysdale
Browse files

KeyMint: version gate attestation of IMEI2 

aosp/3106417 added extra tests with for device ID attestation, but
didn't include a version gate for attesting to the second IMEI value,
which is only present in KeyMint v3+.

Test: VtsAidlKeyMintTargetTest
Change-Id: I95f47942058781709efe96d38442e0518e39705d
parent 8cdcadcb

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

+2 −2
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdTags) { 
        extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());

    }

    string second_imei = get_imei(1);

    if (!second_imei.empty()) {

    if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {

        extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),

                                 second_imei.size());

    }
@@ -2135,7 +2135,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdAllTags) { 
        extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());

    }

    string second_imei = get_imei(1);

    if (!second_imei.empty()) {

    if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {

        extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),

                                 second_imei.size());

    }