commit 4cdcadf70cd85a937dfe0cf5f1def1c21db897e1
author Michael Butler <butlermichael@google.com> Tue Nov 24 19:32:27 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 24 19:32:27 2020 +0000
tree e5ee0738ddbc9093740a16ffa860bad31a87f6df
parent 66b1cfaac0b5e41ece7f11caac3574ecc4efa111
parent 376005883c5981f1255e52e9a4ed417ab81fce58

Merge "Invalidate NN interface objects on cache mismatch"

identity/support/src/IdentityCredentialSupport.cpp

diff --git a/identity/support/src/IdentityCredentialSupport.cpp b/identity/support/src/IdentityCredentialSupport.cpp
index 57cdc98..77b795b 100644
--- a/identity/support/src/IdentityCredentialSupport.cpp
+++ b/identity/support/src/IdentityCredentialSupport.cpp
@@ -1023,11 +1023,12 @@
     // relying party is ever going to trust our batch key and those keys above
     // it.
     //
-    ::keymaster::PureSoftKeymasterContext context(KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);
+    ::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMASTER_4_1,
+                                                  KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);
 
     error = generate_attestation_from_EVP(key, swEnforced, hwEnforced, auth_set, context,
-                                          ::keymaster::kCurrentKeymasterVersion, *attestation_chain,
-                                          *attestation_signing_key, &cert_chain_out);
+                                          *attestation_chain, *attestation_signing_key,
+                                          &cert_chain_out);
 
     if (KM_ERROR_OK != error || !cert_chain_out) {
         LOG(ERROR) << "Error generate attestation from EVP key" << error;
@@ -2402,7 +2403,6 @@
     return ret;
 }
 
-
 vector<uint8_t> testHardwareBoundKey = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 const vector<uint8_t>& getTestHardwareBoundKey() {