Merge "Add explicit values to keymaster_key_format_t"

This commit is contained in:
Shawn Willden 2015-02-14 00:40:41 +00:00 committed by Gerrit Code Review
commit 6bdaf827ef

View file

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