summaryrefslogtreecommitdiffstats
path: root/include/hardware/keymaster_defs.h
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-04-13 11:07:24 -0600
committerShawn Willden <swillden@google.com>2015-04-13 12:13:35 -0600
commitd359b044830b292f492f8a8df5471f869e358399 (patch)
tree3870bb35884d475ce7d441736144f7da51f089ed /include/hardware/keymaster_defs.h
parent845ffceadc0d68ac806ebd6a1811bb43019aefb6 (diff)
downloadhardware_libhardware-d359b044830b292f492f8a8df5471f869e358399.zip
hardware_libhardware-d359b044830b292f492f8a8df5471f869e358399.tar.gz
hardware_libhardware-d359b044830b292f492f8a8df5471f869e358399.tar.bz2
Add KM_ORIGIN_UNKNOWN.
This designates keys whose origin cannot be determined because the keymaster implementation is old and did not record it. Change-Id: I3c366d527ed211c59f6dc04ddb48f3e9b3a07c7d
Diffstat (limited to 'include/hardware/keymaster_defs.h')
-rw-r--r--include/hardware/keymaster_defs.h6
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;
/**