commit 6c4a9591dbe74fa8ff5b7df7965231a38be0e94b
author Shawn Willden <swillden@google.com> Wed Nov 05 20:43:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 05 20:43:56 2014 +0000
tree 8c78aa967b7c7130be695aa454cd0c2f174a052b
parent 0dee6e2c3e9e255c21052f36247356b9f63f0dc5
parent 9976480a6e7fc53b40f0fe97aac29aa297bfd1b7

am 9976480a: Indicate that softkeymaster key blobs are standalone, meaning they don\'t require a functional file system or any other support infrastructure.

* commit '9976480a6e7fc53b40f0fe97aac29aa297bfd1b7':
  Indicate that softkeymaster key blobs are standalone, meaning they don't require a functional file system or any other support infrastructure.

softkeymaster/module.cpp

diff --git a/softkeymaster/module.cpp b/softkeymaster/module.cpp
index bfb1dd5..9eeb9b4 100644
--- a/softkeymaster/module.cpp
+++ b/softkeymaster/module.cpp
@@ -58,7 +58,7 @@
     dev->common.module = (struct hw_module_t*)module;
     dev->common.close = openssl_close;
 
-    dev->flags = KEYMASTER_SOFTWARE_ONLY;
+    dev->flags = KEYMASTER_SOFTWARE_ONLY | KEYMASTER_BLOBS_ARE_STANDALONE;
 
     dev->generate_keypair = openssl_generate_keypair;
     dev->import_keypair = openssl_import_keypair;