commit b50083e235eff99fcd250656cd26754b50924435
author Shawn Willden <swillden@google.com> Mon Jun 01 11:40:24 2015 -0600
committer Shawn Willden <swillden@google.com> Thu Jun 11 09:10:32 2015 -0600
tree 7d98da68d3b4d7a2676139301466779edff41f72
parent 5dc18299df564fd2b8f35cead043dd1ae52e1397

Fix block mode numbering (CTR got added as 4 rather than 3)

Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 8e25e6c..4e769d5 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -150,22 +150,17 @@
 
 /**
  * Symmetric block cipher modes provided by keymaster implementations.
- *
- * KM_MODE_FIRST_UNAUTHENTICATED and KM_MODE_FIRST_AUTHENTICATED are not modes but markers used to
- * separate the available modes into classes.
  */
 typedef enum {
     /* Unauthenticated modes, usable only for encryption/decryption and not generally recommended
      * except for compatibility with existing other protocols. */
-    KM_MODE_FIRST_UNAUTHENTICATED = 1,
-    KM_MODE_ECB = KM_MODE_FIRST_UNAUTHENTICATED,
+    KM_MODE_ECB = 1,
     KM_MODE_CBC = 2,
-    KM_MODE_CTR = 4,
+    KM_MODE_CTR = 3,
 
     /* Authenticated modes, usable for encryption/decryption and signing/verification.  Recommended
      * over unauthenticated modes for all purposes. */
-    KM_MODE_FIRST_AUTHENTICATED = 32,
-    KM_MODE_GCM = KM_MODE_FIRST_AUTHENTICATED,
+    KM_MODE_GCM = 32,
 } keymaster_block_mode_t;
 
 /**