Merge "KM 4 test fix Root-of-Trust parsing" am: 29e3465494 am: f08398126f

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

Change-Id: Idea6c31eee4e4829e3f0282c821c61a9c325c973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tri Vo 2023-05-25 19:03:26 +00:00 committed by Automerger Merge Worker
commit e183724f74

View file

@ -60,13 +60,9 @@ class BootloaderStateTest : public KeymasterHidlTest {
ASSERT_TRUE(attest_rec) << "Failed to get attestation record.";
// Parse root of trust.
HidlBuf verified_boot_key;
keymaster_verified_boot_t verified_boot_state;
bool device_locked;
HidlBuf verified_boot_hash;
auto result =
parse_root_of_trust(attest_rec->data, attest_rec->length, &verified_boot_key,
&verified_boot_state, &device_locked, &verified_boot_hash);
auto result = parse_root_of_trust(attest_rec->data, attest_rec->length, &attestedVbKey_,
&attestedVbState_, &attestedBootloaderState_,
&attestedVbmetaDigest_);
ASSERT_EQ(result, ErrorCode::OK) << "Failed to parse root of trust.";
}