| commit | da606360ccaaed3b25c42107fb460a6f8b41acf1 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Aug 08 10:53:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 10:53:48 2023 +0000 |
| tree | 9e99e5f48d8e170fa8e74d87fa5125e2539709bb | |
| parent | a9d915c5a759e502108fcace90622e024bf4974b [diff] | |
| parent | 955fb9e5fcebc7b61c09a3a92263ab2e8ac9ae2c [diff] |
Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950 Change-Id: I9b15adef6651cf9c35062c4b0bdaeecfef5c1ad9 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;