commit 637259c81fa4e8419c07c4e9125c846c54c2c682
author Eran Messeri <eranm@google.com> Mon Oct 31 12:23:36 2022 +0000
committer Eran Messeri <eranm@google.com> Mon Dec 05 13:18:01 2022 +0000
tree aa62f16f022f4c69d4023de9aa23114a75113480
parent 4d6fb44a088dcff9fb8dd956fe0bf72c0bfd2a66

ID attestation: Pass 2nd IMEI to KeyMint

Pass the 2nd IMEI tag, if provided, to KeyMint.

Bug: 244732345
Test: atest android.keystore.cts.DeviceOwnerKeyManagementTest
Change-Id: I52aea1ba59c4337ba0003784abfc178ab0efee55

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index dbdb4e6..62fd579 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -5335,6 +5335,10 @@
                 SecurityLevel::TRUSTED_ENVIRONMENT,
             ),
             KeyParameter::new(
+                KeyParameterValue::AttestationIdSecondIMEI(vec![4u8, 3u8, 1u8, 2u8]),
+                SecurityLevel::TRUSTED_ENVIRONMENT,
+            ),
+            KeyParameter::new(
                 KeyParameterValue::AttestationIdMEID(vec![4u8, 3u8, 1u8, 2u8]),
                 SecurityLevel::TRUSTED_ENVIRONMENT,
             ),