diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-10 02:24:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-10 02:24:14 +0000 |
| commit | 3f3b9790739a287223cfd63bc72e6b19635dced5 (patch) | |
| tree | e5268a3cb3cadfb859306d3d79e6dd8e435beaea | |
| parent | def4b59e69942bc22cda10448c8e8ee2417a186a (diff) | |
| parent | cd640d125f389576f15af75101dd2b372e907aca (diff) | |
| download | libhardware-3f3b9790739a287223cfd63bc72e6b19635dced5.tar.gz | |
Merge "Reduce the list of keymaster key formats to the required set."
| -rw-r--r-- | include/hardware/keymaster_defs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index ba61aa9d..31a487ef 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -274,10 +274,9 @@ typedef struct { * In the future this list will expand greatly to accommodate asymmetric key import/export. */ typedef enum { - KM_KEY_FORMAT_X509 = 0, /* for public key export, required */ - KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import, required */ - KM_KEY_FORMAT_PKCS12 = 2, /* for asymmetric key pair import, not required */ - KM_KEY_FORMAT_RAW = 3, /* for symmetric key import, required */ + KM_KEY_FORMAT_X509 = 0, /* for public key export */ + KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import */ + KM_KEY_FORMAT_RAW = 3, /* for symmetric key import */ } keymaster_key_format_t; /** |