Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66b1cfaa authored by Shawn Willden's avatar Shawn Willden
Browse files

Update to support keymaster's configurable version. 

Test: VtsHalIdentityTargetTest
Bug: b/173577355
Change-Id: Ia7c1a46edec12047c51ed4888788386dcfe11ca9
parent c86759a1

identity/support/src/IdentityCredentialSupport.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1023,11 +1023,12 @@ optional<vector<vector<uint8_t>>> createAttestation( 
    // 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 @@ vector<vector<uint8_t>> chunkVector(const vector<uint8_t>& content, size_t maxCh 
    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() {