commit 6daf9846eec87c2593de6ac48e3a308e367ab8e4
author Shawn Willden <swillden@google.com> Thu Nov 19 10:11:47 2020 -0700
committer Shawn Willden <swillden@google.com> Tue Nov 24 09:33:53 2020 -0700
tree af0798887fae809679d66a03d044ffb6fe00cfc8
parent 4b590805c63ce860cec6a430d05a7f1840d60ea7

Make keymaster's version configurable.

Test: Keystore CTS tests and Keymaster/KeyMint VTS tests on cuttlefish
Bug: b/173577355
Change-Id: Ie7dda2c09b9d0b8e5b5b69ba4056ac40af67c870

ng/AndroidKeymaster4Device.cpp

diff --git a/ng/AndroidKeymaster4Device.cpp b/ng/AndroidKeymaster4Device.cpp
index 9a71360..f06fcd9 100644
--- a/ng/AndroidKeymaster4Device.cpp
+++ b/ng/AndroidKeymaster4Device.cpp
@@ -220,11 +220,11 @@
     return set;
 }
 
-AndroidKeymaster4Device::AndroidKeymaster4Device(SecurityLevel securityLevel)
+AndroidKeymaster4Device::AndroidKeymaster4Device(KmVersion version, SecurityLevel securityLevel)
     : impl_(new ::keymaster::AndroidKeymaster(
           [&]() -> auto {
               auto context = new PureSoftKeymasterContext(
-                  static_cast<keymaster_security_level_t>(securityLevel));
+                  version, static_cast<keymaster_security_level_t>(securityLevel));
               context->SetSystemVersion(GetOsVersion(), GetOsPatchlevel());
               return context;
           }(),