| commit | 147b459d2c4fa324e620c40a4811c64c06c0237e | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Aug 08 13:04:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 13:04:41 2023 +0000 |
| tree | 2254c65b339294678c1169d44f86c0f81cb65c6e | |
| parent | a5bf7f8b8fef78bf85f136d61bacab789d2b2095 [diff] | |
| parent | 6e755eee65cab85f1d9d33014f737f4f30dbf97d [diff] |
Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc am: b8749b670e am: 6e755eee65 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950 Change-Id: I1a50045938f3a566071b8a9e336c9bfca2ee0eda 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;