diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-10 04:35:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 04:35:15 +0000 |
| commit | e006d2ad901b7eac7c0906d252a6788c150c0437 (patch) | |
| tree | b861a062863b196df46eb96325cff7903b7ddb1b /include | |
| parent | a899066c86e070883011c6693b1d7755d3e68111 (diff) | |
| parent | cc521eada2f2926791eb42a369a1e2151fe18a33 (diff) | |
| download | hardware_libhardware-e006d2ad901b7eac7c0906d252a6788c150c0437.zip hardware_libhardware-e006d2ad901b7eac7c0906d252a6788c150c0437.tar.gz hardware_libhardware-e006d2ad901b7eac7c0906d252a6788c150c0437.tar.bz2 | |
am cc521ead: am 3f3b9790: Merge "Reduce the list of keymaster key formats to the required set."
* commit 'cc521eada2f2926791eb42a369a1e2151fe18a33':
Reduce the list of keymaster key formats to the required set.
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/keymaster_defs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index ba61aa9..31a487e 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -274,10 +274,9 @@ typedef struct { * In the future this list will expand greatly to accommodate asymmetric key import/export. */ typedef enum { - 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 */ + KM_KEY_FORMAT_X509 = 0, /* for public key export */ + KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import */ + KM_KEY_FORMAT_RAW = 3, /* for symmetric key import */ } keymaster_key_format_t; /** |