summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEran Messeri <eranm@google.com>2022-12-05 18:52:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-05 18:52:54 +0000
commitbda7bc0fdeb846b59974d380c1edf329c1f7bfd7 (patch)
tree27305192442b3e658b40624e453334240c84c367
parent6474272267e967ca2a53ec617afd2582fd7c8093 (diff)
parent49f990fb86da1320c4ed2daaa18167ebf876b49f (diff)
downloadlibhardware-bda7bc0fdeb846b59974d380c1edf329c1f7bfd7.tar.gz
Merge "Add the second IMEI tag" am: 9e34eae550 am: 308d43a303 am: 49f990fb86
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117 Change-Id: Iff48066d4457699a80134153e92d2719c15528ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--include/hardware/keymaster_defs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 930aceb0..dd286d6d 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -175,6 +175,8 @@ typedef enum {
attestation is requested. */
KM_TAG_IDENTITY_CREDENTIAL_KEY = KM_BOOL | 721, /* This is an identity credential key */
KM_TAG_STORAGE_KEY = KM_BOOL | 722, /* storage encryption key */
+ KM_TAG_ATTESTATION_ID_SECOND_IMEI = KM_BYTES | 723, /* Used to provide the device's second
+ IMEI to be included in attestation */
/* Tags used only to provide data to or receive data from operations */
KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000, /* Used to provide associated data for AEAD modes. */