Merge "KM 4 test fix Root-of-Trust parsing" into udc-dev am: 0638c50994
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23417822
Change-Id: I51d6831f534a140d2ae8b917b97bd58a21ebb595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keymaster/4.0/vts/functional/BootloaderStateTest.cpp b/keymaster/4.0/vts/functional/BootloaderStateTest.cpp
index 6b5e8bf..912b59b 100644
--- a/keymaster/4.0/vts/functional/BootloaderStateTest.cpp
+++ b/keymaster/4.0/vts/functional/BootloaderStateTest.cpp
@@ -60,13 +60,9 @@
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.";
}