commit 29e3465494e6c5565e1e2d830c1cf7e8a6322f8e
author Tri Vo <trong@google.com> Thu May 25 17:29:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 25 17:29:41 2023 +0000
tree c927416f9e62c490097224614e507d95a36ae6d1
parent b487f23ca9f50ded80fe81e9a50d3ce49c8d0019
parent 4387c4d6195da9a203d5db13638c07a56371dd6c

Merge "KM 4 test fix Root-of-Trust parsing"

keymaster/4.0/vts/functional/BootloaderStateTest.cpp

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.";
     }