summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-25 21:26:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-25 21:26:10 +0000
commit353924555ed8dfdea437d7f5833573963e0755b4 (patch)
tree50d90d48c47a52c4568bbc7dee94c4333f2af608
parentbf3974f323b5ffa5d029fd93208d49ab54222405 (diff)
parent0f6a221b62356eca508d645e88efb1a0ca0e53f8 (diff)
downloadlibhardware-353924555ed8dfdea437d7f5833573963e0755b4.tar.gz
Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62android-r-preview-4android-r-preview-3android-r-preview-2
Change-Id: I1ee8f687385bb2d5026f6bee351008ee8704ae82
-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 0b7bf8a4..2fbfe46d 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -164,6 +164,8 @@ typedef enum {
included in attestation */
KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720, /* Indicates StrongBox device-unique attestation
is requested. */
+ KM_TAG_IDENTITY_CREDENTIAL_KEY = KM_BOOL | 721, /* This is an identity credential key */
+
/* 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. */