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

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

Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5 am:... 

Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5 am: da606360 am: b8749b67

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



Change-Id: If1346ac619398e68a006a076d172f84c14f6ff73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 362ca159 b8749b67

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

+3 −1
Original line number Diff line number Diff line
@@ -919,7 +919,9 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) { 
                    .Authorization(TAG_ATTESTATION_ID_MODEL, "malicious-model");



    if (isSecondImeiIdAttestationRequired()) {

        attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, "invalid-second-imei");

        // Note: the invalid value here is < 16 bytes long to avoid triggering any implementation

        // checks on valid IMEI lengths.

        attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, "invalid-imei2");

    }

    vector<uint8_t> key_blob;

    vector<KeyCharacteristics> key_characteristics;