diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-14 17:42:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-14 17:43:00 +0000 |
| commit | 4827279cecbb5160788ac0cd923eb6b16f61b81e (patch) | |
| tree | 3870bb35884d475ce7d441736144f7da51f089ed | |
| parent | 845ffceadc0d68ac806ebd6a1811bb43019aefb6 (diff) | |
| parent | d359b044830b292f492f8a8df5471f869e358399 (diff) | |
| download | libhardware-4827279cecbb5160788ac0cd923eb6b16f61b81e.tar.gz | |
Merge "Add KM_ORIGIN_UNKNOWN."
| -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 81a62fea..2b43f2c3 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; /** |