From a0752ce6debf913b8c91ccecc33c76fec6adf67f Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Tue, 1 Jun 2021 09:51:30 -0400 Subject: [PATCH] identity: Fix VTS test failure caused by unrelated change to system/keymaster. Bug: 189447009 Test: atest VtsHalIdentityTargetTest Test: atest CtsIdentityTestCases Change-Id: I58426f1551efa920909c759cf5e10f44c6cfc5d4 --- identity/support/src/IdentityCredentialSupport.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/identity/support/src/IdentityCredentialSupport.cpp b/identity/support/src/IdentityCredentialSupport.cpp index 4547624fde..7f4674d24a 100644 --- a/identity/support/src/IdentityCredentialSupport.cpp +++ b/identity/support/src/IdentityCredentialSupport.cpp @@ -644,7 +644,7 @@ optional>> createAttestation( // the VTS tests. Of course, this is a pretend-only game since hopefully no // relying party is ever going to trust our batch key and those keys above // it. - ::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMASTER_4_1, + ::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMINT_1, KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT); keymaster_error_t error; @@ -682,10 +682,9 @@ optional>> createAttestation( i2d_X509_NAME(subjectName.get(), &subjectPtr); - uint64_t nowMilliSeconds = time(nullptr) * 1000; ::keymaster::AuthorizationSet auth_set( ::keymaster::AuthorizationSetBuilder() - .Authorization(::keymaster::TAG_CERTIFICATE_NOT_BEFORE, nowMilliSeconds) + .Authorization(::keymaster::TAG_CERTIFICATE_NOT_BEFORE, activeTimeMilliSeconds) .Authorization(::keymaster::TAG_CERTIFICATE_NOT_AFTER, expireTimeMilliSeconds) .Authorization(::keymaster::TAG_ATTESTATION_CHALLENGE, challenge.data(), challenge.size())