| commit | 86ca9454c7fff45e61de1cfda16ff06d3657f5de | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 24 18:42:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 24 18:42:50 2020 +0000 |
| tree | fbbb513db09299b16df642dd5bf49866dd21993b | |
| parent | 5925fb435abcb4ff4ff6df0397f426215a990fb5 [diff] | |
| parent | efb51f7ddfdd2ffbb60256bb9ea97cff95306800 [diff] |
Merge "Update to support keymaster's configurable version." am: efb51f7ddf Original change: https://android-review.googlesource.com/c/platform/system/security/+/1507176 Change-Id: Id88d30a3df421a718fac2252ef43b54c5d783b6b
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) {