commit cd640d125f389576f15af75101dd2b372e907aca
author Shawn Willden <swillden@google.com> Tue Apr 07 13:48:27 2015 -0600
committer Shawn Willden <swillden@google.com> Thu Apr 09 12:31:18 2015 -0600
tree e5268a3cb3cadfb859306d3d79e6dd8e435beaea
parent 8412fdc42866b4d5c07370f06c2767a4cad5c23a

Reduce the list of keymaster key formats to the required set.

Change-Id: I3a0830ab2066d4c16c084d19040ec98e520896d4

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index ba61aa9..31a487e 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -274,10 +274,9 @@
  * 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;
 
 /**