Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7f am: b87becf1c2

am: 7fdf8d791f

Change-Id: I63b0905fc6091f62b297ed9c85f21e97fe84decd
This commit is contained in:
Iris Chang 2017-10-06 01:53:28 +00:00 committed by android-build-merger
commit 41df3d9063

View file

@ -274,10 +274,12 @@ ErrorCode parse_attestation_record(const uint8_t* asn1_key_desc, size_t asn1_key
*keymaster_security_level =
static_cast<SecurityLevel>(ASN1_ENUMERATED_get(record->keymaster_security_level));
attestation_challenge->setToExternal(record->attestation_challenge->data,
record->attestation_challenge->length);
unique_id->setToExternal(record->unique_id->data, record->unique_id->length);
auto& chall = record->attestation_challenge;
attestation_challenge->resize(chall->length);
memcpy(attestation_challenge->data(), chall->data, chall->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);
if (error != ErrorCode::OK) return error;