commit 613b2d5663be0b9cd454d30985c7bcf1bc1fbbd8
author Shawn Willden <swillden@google.com> Thu Nov 19 09:56:59 2020 -0700
committer Shawn Willden <swillden@google.com> Mon Nov 23 22:25:57 2020 -0700
tree 44675f55fe364ba3d1c519ac93d363d3f5c2c640
parent 8e019fa90d08c806111cbc1e54d0621a91d4f1f3

Update to support keymaster's configurable version.

Test: Keystore CTS tests
Bug: b/173577355
Change-Id: Iccb0b197bd939ad867ae3b02fcc69630809f1f21

keystore/legacy_keymaster_device_wrapper.cpp

diff --git a/keystore/legacy_keymaster_device_wrapper.cpp b/keystore/legacy_keymaster_device_wrapper.cpp
index 86d286e..052f394 100644
--- a/keystore/legacy_keymaster_device_wrapper.cpp
+++ b/keystore/legacy_keymaster_device_wrapper.cpp
@@ -532,7 +532,7 @@
 
 sp<IKeymasterDevice> makeSoftwareKeymasterDevice() {
     keymaster2_device_t* dev = nullptr;
-    dev = (new SoftKeymasterDevice)->keymaster2_device();
+    dev = (new SoftKeymasterDevice(keymaster::KmVersion::KEYMASTER_2))->keymaster2_device();
 
     auto kmrc = ::keymaster::ConfigureDevice(dev);
     if (kmrc != KM_ERROR_OK) {