diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-06-04 18:02:44 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-06-04 18:02:44 +0000 |
| commit | c85bde0398d2a185e66a61cdabd26e5435bb4807 (patch) | |
| tree | 3d9efc2d95fccc971f519d1d323a19a4621683cd /identity/support/src | |
| parent | a01a9128380dad45a28f4740a57136a058eb9d12 (diff) | |
| parent | e013dd1a8b8f0df65b20c4de224effa1a7fcc61b (diff) | |
Merge SP1A.210604.001
Change-Id: I78feee65e602d45bb0e3e90536729623b0f3d4f5
Diffstat (limited to 'identity/support/src')
| -rw-r--r-- | identity/support/src/IdentityCredentialSupport.cpp | 5 |
1 files 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<vector<vector<uint8_t>>> 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<vector<vector<uint8_t>>> 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()) |