diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-14 18:23:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 18:23:44 +0000 |
| commit | 50e1759db488dfe80a2213e9199d34ae7dc39608 (patch) | |
| tree | ff7d269f2a12547c456f4d6a36f444fa4dcba712 /include | |
| parent | 4b49035055487058cb0f82db6eb8b3ec740934d8 (diff) | |
| parent | 6c93927dd390abcf0e6254a38ef2c0f14fc1a51e (diff) | |
| download | hardware_libhardware-50e1759db488dfe80a2213e9199d34ae7dc39608.zip hardware_libhardware-50e1759db488dfe80a2213e9199d34ae7dc39608.tar.gz hardware_libhardware-50e1759db488dfe80a2213e9199d34ae7dc39608.tar.bz2 | |
am 6c93927d: am 4827279c: Merge "Add KM_ORIGIN_UNKNOWN."
* commit '6c93927dd390abcf0e6254a38ef2c0f14fc1a51e':
Add KM_ORIGIN_UNKNOWN.
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/keymaster_defs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 81a62fe..2b43f2c 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -206,7 +206,11 @@ typedef enum { */ typedef enum { KM_ORIGIN_GENERATED = 0, /* Generated in keymaster */ - KM_ORIGIN_IMPORTED = 2, /* Imported, origin unknown */ + KM_ORIGIN_IMPORTED = 2, /* Imported, origin unknown */ + KM_ORIGIN_UNKNOWN = 3, /* Keymaster did not record origin. This value can only be seen on + * keys in a keymaster0 implementation. The keymaster0 adapter uses + * this value to document the fact that it is unkown whether the key + * was generated inside or imported into keymaster. */ } keymaster_key_origin_t; /** |