From: Kenny Root <kroot@google.com>
Date: Mon, 26 Mar 2012 20:47:48 +0000 (-0700)
Subject: keymaster: add flags for keymaster features
X-Git-Tag: android-x86-4.4-r1~296^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c338f473122e85fd64379524a91219872f80720;p=android-x86%2Fhardware-libhardware.git

keymaster: add flags for keymaster features

The first flag is something for the default implementation to use to
indicate that its keys are importable to hardware keymasters. This
allows easy migration from the default software implementation to
hardware implementations as they become available.

Change-Id: Ideb26a4b1ac91ca8c330a4fe4df323f028b2f855
---

diff --git a/include/hardware/keymaster.h b/include/hardware/keymaster.h
index 3c7799a..d4cf124 100644
--- a/include/hardware/keymaster.h
+++ b/include/hardware/keymaster.h
@@ -39,6 +39,20 @@ __BEGIN_DECLS
  */
 #define KEYMASTER_API_VERSION 1
 
+/**
+ * Flags for keymaster_device::flags
+ */
+enum {
+    /*
+     * Indicates this keymaster implementation does not have hardware that
+     * keeps private keys out of user space.
+     *
+     * This should not be implemented on anything other than the default
+     * implementation.
+     */
+    KEYMASTER_SOFTWARE_ONLY = 0x00000001,
+};
+
 struct keystore_module {
     hw_module_t common;
 };
@@ -85,6 +99,11 @@ struct keymaster_device {
 
     uint32_t client_version;
 
+    /**
+     * See flags defined for keymaster_device::flags above.
+     */
+    uint32_t flags;
+
     void* context;
 
     /**