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

am 3f3b9790: Merge "Reduce the list of keymaster key formats to the required set."

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

7
include/hardware/keymaster_defs.h
View file

@ -274,10 +274,9 @@ typedef struct {
* In the future this list will expand greatly to accommodate asymmetric key import/export. * In the future this list will expand greatly to accommodate asymmetric key import/export.
*/ */
typedef enum { typedef enum {
KM_KEY_FORMAT_X509 = 0, /* for public key export, required */ KM_KEY_FORMAT_X509 = 0, /* for public key export */
KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import, required */ KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import */
KM_KEY_FORMAT_PKCS12 = 2, /* for asymmetric key pair import, not required */ KM_KEY_FORMAT_RAW = 3, /* for symmetric key import */
KM_KEY_FORMAT_RAW = 3, /* for symmetric key import, required */
} keymaster_key_format_t; } keymaster_key_format_t;
/** /**