commit 949d6d4bfc1cf37a84d5d4ac00a20017941fdeba
author Shawn Willden <swillden@google.com> Tue Feb 03 20:30:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 03 20:30:05 2015 +0000
tree eccc4e3ccefd6a747fd0e0206770a0d49ab215f7
parent f3391a93188de86f7e15859e613faba94f65cdbc
parent e1b7636ca1c60b766a195ad20b3e2957f1edb375

Merge changes I38700cda,I088e6094

* changes:
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 95ffe8e..4649055 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -187,7 +187,7 @@
 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 @@
     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;
 
 /**