tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "KeyMint: version gate attestation of IMEI2" into main am: 54db6b2214 am: e10b12929c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3125954

Change-Id: I30dcfd156bacbf8ff25b047af5af676f84058d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale 2024-06-12 10:36:57 +00:00 committed by Automerger Merge Worker
commit 853a3a6934
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View file

@ -2059,7 +2059,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdTags) {
extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size()); extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());
} }
string second_imei = get_imei(1); string second_imei = get_imei(1);
if (!second_imei.empty()) { if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {
extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(), extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),
second_imei.size()); second_imei.size());
} }
@ -2135,7 +2135,7 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdAllTags) {
extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size()); extra_tags.Authorization(TAG_ATTESTATION_ID_IMEI, imei.data(), imei.size());
} }
string second_imei = get_imei(1); string second_imei = get_imei(1);
if (!second_imei.empty()) { if (!second_imei.empty() && isSecondImeiIdAttestationRequired()) {
extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(), extra_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, second_imei.data(),
second_imei.size()); second_imei.size());
} }