diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-25 21:41:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-25 21:41:46 +0000 |
| commit | 0f30f984e8efb3b907d801cf62b855e6323b83ba (patch) | |
| tree | f15dcacd90ba302575d8ef04239f080cc02315b7 /include | |
| parent | 220ed7063eddc77b1fa17a9792ba71358c3f9484 (diff) | |
| parent | 353924555ed8dfdea437d7f5833573963e0755b4 (diff) | |
| download | platform_hardware_libhardware-0f30f984e8efb3b907d801cf62b855e6323b83ba.tar.gz platform_hardware_libhardware-0f30f984e8efb3b907d801cf62b855e6323b83ba.tar.bz2 platform_hardware_libhardware-0f30f984e8efb3b907d801cf62b855e6323b83ba.zip | |
Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e
Change-Id: I8b9be13d5928f2a9221c08a5801b8a3b4f7f4fe0
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/keymaster_defs.h | 2 |
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. */ |