Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." am: aef57a826a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icde3291dbd1813cb068ff07e9d4810e871793dc7
This commit is contained in:
Treehugger Robot
2021-02-11 23:12:56 +00:00
committed by Automerger Merge Worker
parent eebcaea5b2 aef57a826a
commit fb669b9e39
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
identity/support/src/IdentityCredentialSupport.cpp
View File

@@ -874,8 +874,11 @@ 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_AFTER, expireTimeMilliSeconds)
.Authorization(::keymaster::TAG_ATTESTATION_CHALLENGE, challenge.data(),
challenge.size())
.Authorization(::keymaster::TAG_ACTIVE_DATETIME, activeTimeMilliSeconds)
@@ -918,7 +921,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::CertificateChain cert_chain_out = generate_attestation_from_EVP(
@@ -926,7 +929,7 @@ optional<vector<vector<uint8_t>>> createAttestation(
*attestation_signing_key, &error);
if (KM_ERROR_OK != error) {
LOG(ERROR) << "Error generate attestation from EVP key" << error;
LOG(ERROR) << "Error generating attestation from EVP key: " << error;
return {};
}