diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 01:24:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 01:24:06 +0000 |
| commit | 220ed7063eddc77b1fa17a9792ba71358c3f9484 (patch) | |
| tree | 8e5659ab45ed436a37d59c9c80d4acd9c6d71dd0 | |
| parent | a7aa2cdbc8e3911ddb840d32f538efeee73ffaed (diff) | |
| parent | 7dcc83509764b6eb9886c35350b320896a655365 (diff) | |
| download | libhardware-220ed7063eddc77b1fa17a9792ba71358c3f9484.tar.gz | |
Merge "Add Keymaster4.1 definitions." am: 09b2f93ab9 am: bf3974f323 am: 7dcc835097
Change-Id: I99eded133e22ce7235d85a8ccb24c903b29c9c3e
| -rw-r--r-- | include/hardware/keymaster_defs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index d92ce007..0b7bf8a4 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -77,6 +77,7 @@ typedef enum { KM_TAG_BOOTLOADER_ONLY = KM_BOOL | 302, /* Usable only by bootloader */ KM_TAG_ROLLBACK_RESISTANCE = KM_BOOL | 303, /* Hardware enforced deletion with deleteKey * or deleteAllKeys is supported */ + KM_TAG_EARLY_BOOT_ONLY = KM_BOOL | 305, /* Key can only be used during early boot. */ /* * Tags that should be semantically enforced by hardware if possible and will otherwise be @@ -161,6 +162,8 @@ typedef enum { attestation */ KM_TAG_ATTESTATION_ID_MODEL = KM_BYTES | 717, /* Used to provide the device's model name to be included in attestation */ + KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720, /* Indicates StrongBox device-unique attestation + is requested. */ /* 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. */ @@ -373,6 +376,7 @@ typedef enum { typedef enum { KM_SECURITY_LEVEL_SOFTWARE = 0, KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT = 1, + KM_SECURITY_LEVEL_STRONGBOX = 2, } keymaster_security_level_t; /** @@ -461,6 +465,9 @@ typedef enum { KM_ERROR_ROLLBACK_RESISTANCE_UNAVAILABLE = -67, KM_ERROR_NO_USER_CONFIRMATION = -71, KM_ERROR_DEVICE_LOCKED = -72, + KM_ERROR_EARLY_BOOT_ENDED = -73, + KM_ERROR_ATTESTATION_KEYS_NOT_PROVISIONED = -74, + KM_ERROR_ATTESTATION_IDS_NOT_PROVISIONED = -75, KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_VERSION_MISMATCH = -101, |