diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-03 05:30:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 05:30:18 +0000 |
| commit | b248e7125b6068105242fa26e59be0ac2abdcbef (patch) | |
| tree | fc0d5268e82640d57b51d8ff894438bbd9c503bf | |
| parent | f291adb5935545af30c962253234ff5da557cfa8 (diff) | |
| parent | 4c19a3af3535eb3442ff7cc4235420baf16322b7 (diff) | |
| download | hardware_libhardware-b248e7125b6068105242fa26e59be0ac2abdcbef.zip hardware_libhardware-b248e7125b6068105242fa26e59be0ac2abdcbef.tar.gz hardware_libhardware-b248e7125b6068105242fa26e59be0ac2abdcbef.tar.bz2 | |
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
| -rw-r--r-- | include/hardware/keymaster_defs.h | 11 |
1 files changed, 3 insertions, 8 deletions
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 @@ typedef enum { /** * 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; /** |