| commit | 321ece1e9c67d9e604b0bce58295ebc32846cc34 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Feb 28 07:03:53 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 28 07:03:53 2024 +0000 |
| tree | 8b781246bd2cf6fe8b5297096ccc69d1eb9a96f3 | |
| parent | 35ac8e4e0925e57131809b466dd41f575eae4664 [diff] | |
| parent | 3a9d425ec6db298deef9fc2e9a5eb6ac6182201e [diff] |
KeyMint: use a smaller invalid IMEI value am: 8351f33b2b am: 3a9d425ec6 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977372 Change-Id: Ie36ecb4968a0c3a8044fc34da31b19880f024a0f 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 6d289ec..4ae0383 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
@@ -939,7 +939,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;