| commit | 6e755eee65cab85f1d9d33014f737f4f30dbf97d | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Aug 08 12:18:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 12:18:21 2023 +0000 |
| tree | 81f36cd428a881d4ce95910a4b515b4f276302f0 | |
| parent | 362ca159e0b1daaff29103e1c6e7930bdf1b62d4 [diff] | |
| parent | b8749b670ebfbfeb41dcfd1779386db05ef094d7 [diff] |
Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc am: b8749b670e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950 Change-Id: If1346ac619398e68a006a076d172f84c14f6ff73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;