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>
This commit is contained in:
David Drysdale 2023-08-08 12:18:21 +00:00 committed by Automerger Merge Worker
commit 6e755eee65

View file

@ -919,7 +919,9 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) {
.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;