diff options
| author | Shawn Willden <swillden@google.com> | 2015-02-14 01:04:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-14 01:04:48 +0000 |
| commit | 5d4ee176fb9b9c48505476a2200e20ecaca90353 (patch) | |
| tree | f150380722deb2ed4d63d640b7cc23cec5c3849f | |
| parent | 8c0e65b45d8aad43e6530094496af9962ee50ec3 (diff) | |
| parent | d7cc04b275ea6d1cec863159327281b0ffbc8120 (diff) | |
| download | hardware_libhardware-5d4ee176fb9b9c48505476a2200e20ecaca90353.zip hardware_libhardware-5d4ee176fb9b9c48505476a2200e20ecaca90353.tar.gz hardware_libhardware-5d4ee176fb9b9c48505476a2200e20ecaca90353.tar.bz2 | |
am d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"
* commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120':
Add explicit values to keymaster_key_format_t
| -rw-r--r-- | include/hardware/keymaster_defs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 4649055..770c66e 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -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; /** |