tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am b248e712: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev

Browse source 
* commit 'b248e7125b6068105242fa26e59be0ac2abdcbef':
  Fix block mode numbering (CTR got added as 4 rather than 3)
This commit is contained in:
Shawn Willden 2015-06-03 17:45:36 +00:00 committed by Android Git Automerger
commit eb62992159
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/hardware/keymaster_defs.h
View file

@ -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;
/**