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

am efbc9f6d: am 949d6d4b: Merge changes I38700cda,I088e6094

Browse source 
* commit 'efbc9f6d0b6cbf890ee894ee66f2a6f8308c1766':
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.
This commit is contained in:
Shawn Willden 2015-02-03 20:47:53 +00:00 committed by Android Git Automerger
commit 26581a4008
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/hardware/keymaster_defs.h
View file

@ -187,7 +187,7 @@ typedef enum {
typedef enum {
/* Asymmetric algorithms. */
KM_ALGORITHM_RSA = 1, /* required */
KM_ALGORITHM_DSA = 2, /* required */
KM_ALGORITHM_DSA = 2,
KM_ALGORITHM_ECDSA = 3, /* required */
KM_ALGORITHM_ECIES = 4,
/* FIPS Approved Ciphers */
@ -359,6 +359,7 @@ 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 */
} keymaster_key_format_t;
/**