diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl index e310b4448f..6ae2369fbf 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl @@ -90,6 +90,7 @@ enum Tag { DEVICE_UNIQUE_ATTESTATION = 1879048912, IDENTITY_CREDENTIAL_KEY = 1879048913, STORAGE_KEY = 1879048914, + ATTESTATION_ID_SECOND_IMEI = -1879047469, ASSOCIATED_DATA = -1879047192, NONCE = -1879047191, MAC_LENGTH = 805307371, diff --git a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl index 47361d5536..837fc814a9 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl @@ -726,9 +726,10 @@ enum Tag { ATTESTATION_ID_SERIAL = TagType.BYTES | 713, /** - * Tag::ATTESTATION_ID_IMEI provides the IMEIs for all radios on the device to attested key + * Tag::ATTESTATION_ID_IMEI provides the IMEI one of the radios on the device to attested key * generation/import operations. This field must be set only when requesting attestation of the - * device's identifiers. + * device's identifiers. If the device has more than one IMEI, a second IMEI may be included + * by using the Tag::ATTESTATION_ID_SECOND_IMEI tag. * * If the device does not support ID attestation (or destroyAttestationIds() was previously * called and the device can no longer attest its IDs), any key attestation request that @@ -882,6 +883,20 @@ enum Tag { */ STORAGE_KEY = TagType.BOOL | 722, + /** + * Tag::ATTESTATION_ID_SECOND_IMEI provides an additional IMEI of one of the radios on the + * device to attested key generation/import operations. This field MUST be accompanied by + * the Tag::ATTESTATION_ID_IMEI tag. It would only be used to convery a second IMEI the device + * has, after Tag::ATTESTATION_ID_SECOND_IMEI has been used to convery the first IMEI. + * + * If the device does not support ID attestation (or destroyAttestationIds() was previously + * called and the device can no longer attest its IDs), any key attestation request that + * includes this tag must fail with ErrorCode::CANNOT_ATTEST_IDS. + * + * Must never appear in KeyCharacteristics. + */ + ATTESTATION_ID_SECOND_IMEI = TagType.BYTES | 723, + /** * OBSOLETE: Do not use. *