commit 77517b941815ff2c9e5ef40459881f7cb399bd9c
author Shawn Willden <swillden@google.com> Mon Dec 21 23:48:09 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 21 23:48:09 2015 +0000
tree cca317174da8d4d3d536f1f7ca26351a4e6442ff
parent 2092728a89fc8ebe0d467375038f370575794ca2
parent b87d707b96e6af9dabd23481b5c7a51160630831

Merge "Set SoftKeymasterDevice flags correctly."

include/keymaster/soft_keymaster_device.h

diff --git a/include/keymaster/soft_keymaster_device.h b/include/keymaster/soft_keymaster_device.h
index 5d7b83b..16c22e0 100644
--- a/include/keymaster/soft_keymaster_device.h
+++ b/include/keymaster/soft_keymaster_device.h
@@ -78,7 +78,7 @@
     }
 
   private:
-    void initialize_device_struct();
+    void initialize_device_struct(uint32_t flags);
     bool FindUnsupportedDigest(keymaster_algorithm_t algorithm, keymaster_purpose_t purpose,
                                const AuthorizationSet& params,
                                keymaster_digest_t* unsupported) const;

soft_keymaster_device.cpp

diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp
index 9d8fb90..80e6a25 100644
--- a/soft_keymaster_device.cpp
+++ b/soft_keymaster_device.cpp
@@ -122,7 +122,8 @@
     LOG_I("Creating device", 0);
     LOG_D("Device address: %p", this);
 
-    initialize_device_struct();
+    initialize_device_struct(KEYMASTER_SOFTWARE_ONLY | KEYMASTER_BLOBS_ARE_STANDALONE |
+                             KEYMASTER_SUPPORTS_EC);
 }
 
 SoftKeymasterDevice::SoftKeymasterDevice(SoftKeymasterContext* context)
@@ -137,7 +138,8 @@
     LOG_I("Creating test device", 0);
     LOG_D("Device address: %p", this);
 
-    initialize_device_struct();
+    initialize_device_struct(KEYMASTER_SOFTWARE_ONLY | KEYMASTER_BLOBS_ARE_STANDALONE |
+                             KEYMASTER_SUPPORTS_EC);
 }
 
 keymaster_error_t SoftKeymasterDevice::SetHardwareDevice(keymaster0_device_t* keymaster0_device) {
@@ -151,7 +153,7 @@
     if (error != KM_ERROR_OK)
         return error;
 
-    initialize_device_struct();
+    initialize_device_struct(keymaster0_device->flags);
 
     module_name_ = device_.common.module->name;
     module_name_.append("(Wrapping ");
@@ -183,7 +185,7 @@
     if (error != KM_ERROR_OK)
         return error;
 
-    initialize_device_struct();
+    initialize_device_struct(keymaster1_device->flags);
 
     module_name_ = device_.common.module->name;
     module_name_.append(" (Wrapping ");
@@ -221,7 +223,7 @@
     return true;
 }
 
-void SoftKeymasterDevice::initialize_device_struct() {
+void SoftKeymasterDevice::initialize_device_struct(uint32_t flags) {
     memset(&device_, 0, sizeof(device_));
 
     device_.common.tag = HARDWARE_DEVICE_TAG;
@@ -229,7 +231,7 @@
     device_.common.module = reinterpret_cast<hw_module_t*>(&soft_keymaster_device_module);
     device_.common.close = &close_device;
 
-    device_.flags = KEYMASTER_BLOBS_ARE_STANDALONE | KEYMASTER_SUPPORTS_EC;
+    device_.flags = flags;
 
     // keymaster0 APIs
     device_.generate_keypair = nullptr;