commit 955fb9e5fcebc7b61c09a3a92263ab2e8ac9ae2c
author David Drysdale <drysdale@google.com> Tue Aug 08 10:16:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 08 10:16:23 2023 +0000
tree 9e99e5f48d8e170fa8e74d87fa5125e2539709bb
parent ff1f1f34940662b2ebd94c933259c4d0161b4c44
parent 0215cb3d3ef4e5421a1f4c414b7a20b83edf2576

Merge "KeyMint: use a smaller invalid IMEI value" into main

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

diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
index 8a8eaa4..8aef9d9 100644
--- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
+++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
@@ -919,7 +919,9 @@
                     .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;