tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "identity: Fix VTS test failure caused by unrelated change to system/keymaster."

Browse source
This commit is contained in:
David Zeuthen 2021-06-01 19:01:10 +00:00 committed by Gerrit Code Review
commit f1e4bd1126
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
identity/support/src/IdentityCredentialSupport.cpp
View file

@ -644,7 +644,7 @@ optional<vector<vector<uint8_t>>> createAttestation(
// the VTS tests. Of course, this is a pretend-only game since hopefully no // 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 // relying party is ever going to trust our batch key and those keys above
// it. // it.
::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMASTER_4_1, ::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMINT_1,
KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT); KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);
keymaster_error_t error; keymaster_error_t error;
@ -682,10 +682,9 @@ optional<vector<vector<uint8_t>>> createAttestation(
i2d_X509_NAME(subjectName.get(), &subjectPtr); i2d_X509_NAME(subjectName.get(), &subjectPtr);
uint64_t nowMilliSeconds = time(nullptr) * 1000;
::keymaster::AuthorizationSet auth_set( ::keymaster::AuthorizationSet auth_set(
::keymaster::AuthorizationSetBuilder() ::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_CERTIFICATE_NOT_AFTER, expireTimeMilliSeconds)
.Authorization(::keymaster::TAG_ATTESTATION_CHALLENGE, challenge.data(), .Authorization(::keymaster::TAG_ATTESTATION_CHALLENGE, challenge.data(),
challenge.size()) challenge.size())