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

Commit 54ca32a1 authored by Iris Chang's avatar Iris Chang
Browse files

VTS: fix VtsHalKeymasterV3_0Target issue 

Failed cases:
AttestationTest.RsaAttestation
AttestationTest.EcAttestation

Analysis:
The verify_attestation_record() in Keymaster_hidl_hal_test.cpp calls
parse_attestation_record() to set the value of att_challenge. It fails
to compare att_challenge with challenge by memcmp.
Because setToExternal() method uses buffer pointer to local variable
(record), not use memcpy to copy into itself buffer in
parse_attestation_record(). When it leaves the parse_attestation_record(),
we will get the att_challenge which is null buffer to compare with challenge
incorrectly.

Fix: use memcpy to copy the buffer.

Bug: 65039571
Test: build passed. VtsHalKeymasterV3_0Target -> PASSED: 106, FAILED: 0.

Change-Id: I700a9242cc9a5f4cb196b62860823601e4088531
parent 99601484

keymaster/3.0/vts/functional/attestation_record.cpp

+6 −4
Original line number Original line Diff line number Diff line
@@ -274,10 +274,12 @@ ErrorCode parse_attestation_record(const uint8_t* asn1_key_desc, size_t asn1_key 
    *keymaster_security_level =

    *keymaster_security_level =

        static_cast<SecurityLevel>(ASN1_ENUMERATED_get(record->keymaster_security_level));

        static_cast<SecurityLevel>(ASN1_ENUMERATED_get(record->keymaster_security_level));





    attestation_challenge->setToExternal(record->attestation_challenge->data,

    auto& chall = record->attestation_challenge;

                                         record->attestation_challenge->length);

    attestation_challenge->resize(chall->length);



    memcpy(attestation_challenge->data(), chall->data, chall->length);

    unique_id->setToExternal(record->unique_id->data, record->unique_id->length);

    auto& uid = record->unique_id;

    unique_id->resize(uid->length);

    memcpy(unique_id->data(), uid->data, uid->length);





    ErrorCode error = extract_auth_list(record->software_enforced, software_enforced);

    ErrorCode error = extract_auth_list(record->software_enforced, software_enforced);

    if (error != ErrorCode::OK) return error;

    if (error != ErrorCode::OK) return error;