diff options
| author | Shawn Willden <swillden@google.com> | 2015-07-27 20:51:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 20:51:19 +0000 |
| commit | afac8dd61e6f0554f24b6d4375b8eb426ea08884 (patch) | |
| tree | 4076d8e4e6ff914437991a4b8c3e252f9f4fd7d9 /include/hardware/keymaster_defs.h | |
| parent | d4884e2f3c138a7cc881bb1fb34b672a1c9db595 (diff) | |
| parent | 70335f3d30cf32a6f0352b75430aa6474821399d (diff) | |
| download | hardware_libhardware-afac8dd61e6f0554f24b6d4375b8eb426ea08884.zip hardware_libhardware-afac8dd61e6f0554f24b6d4375b8eb426ea08884.tar.gz hardware_libhardware-afac8dd61e6f0554f24b6d4375b8eb426ea08884.tar.bz2 | |
am 70335f3d: Correct keymaster1 documentation.
* commit '70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
Diffstat (limited to 'include/hardware/keymaster_defs.h')
| -rw-r--r-- | include/hardware/keymaster_defs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index b19086e..5be956d 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -115,8 +115,7 @@ typedef enum { KM_TAG_CREATION_DATETIME = KM_DATE | 701, /* Key creation time */ KM_TAG_ORIGIN = KM_ENUM | 702, /* keymaster_key_origin_t. */ KM_TAG_ROLLBACK_RESISTANT = KM_BOOL | 703, /* Whether key is rollback-resistant. */ - KM_TAG_ROOT_OF_TRUST = KM_BYTES | 704, /* Root of trust ID. Empty array means usable by all - roots. */ + KM_TAG_ROOT_OF_TRUST = KM_BYTES | 704, /* Root of trust ID. */ /* 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. */ |