commit 8412fdc42866b4d5c07370f06c2767a4cad5c23a
author Shawn Willden <swillden@google.com> Tue Apr 07 13:41:30 2015 -0600
committer Shawn Willden <swillden@google.com> Thu Apr 09 12:31:18 2015 -0600
tree 054674f7d9e71cc68b5292dc7769b22ae01a0d58
parent fe6c4f0633aa88c1cb84a46362cc74de1c4ddd1e

Reduce the list of keymaster padding modes to the required set.

Change-Id: If04ffc8e92678f57e2b730f77c0fab195e1096c4

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index c4e9fd5..ba61aa9 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -176,16 +176,12 @@
  * cryptographically-appropriate pairs.
  */
 typedef enum {
-    KM_PAD_NONE = 1,     /* required, deprecated */
-    KM_PAD_RSA_OAEP = 2, /* required */
-    KM_PAD_RSA_PSS = 3,  /* required */
+    KM_PAD_NONE = 1, /* deprecated */
+    KM_PAD_RSA_OAEP = 2,
+    KM_PAD_RSA_PSS = 3,
     KM_PAD_RSA_PKCS1_1_5_ENCRYPT = 4,
     KM_PAD_RSA_PKCS1_1_5_SIGN = 5,
-    KM_PAD_ANSI_X923 = 32,
-    KM_PAD_ISO_10126 = 33,
-    KM_PAD_ZERO = 64,  /* required */
-    KM_PAD_PKCS7 = 65, /* required */
-    KM_PAD_ISO_7816_4 = 66,
+    KM_PAD_PKCS7 = 64,
 } keymaster_padding_t;
 
 /**