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

am def4b59e: Merge "Reduce the list of keymaster padding modes to the required set."

Browse source 
* commit 'def4b59e69942bc22cda10448c8e8ee2417a186a':
  Reduce the list of keymaster padding modes to the required set.
This commit is contained in:
Shawn Willden 2015-04-10 02:43:25 +00:00 committed by Android Git Automerger
commit b0759b61f8
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/hardware/keymaster_defs.h
View file

@ -176,16 +176,12 @@ typedef enum {
* 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;
/**