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

Commit de19c07e authored by Tri Vo's avatar Tri Vo Committed by Automerger Merge Worker
Browse files

Merge "KM 4 test fix Root-of-Trust parsing" into udc-dev am: 0638c509 am: 83654860 

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



Change-Id: I96f5ab603d2ae2ebdfaaddd3771f7edecd48b971
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1db2508 83654860

keymaster/4.0/vts/functional/BootloaderStateTest.cpp

+3 −7
Original line number Original line Diff line number Diff line
@@ -60,13 +60,9 @@ class BootloaderStateTest : public KeymasterHidlTest { 
        ASSERT_TRUE(attest_rec) << "Failed to get attestation record.";

        ASSERT_TRUE(attest_rec) << "Failed to get attestation record.";





        // Parse root of trust.

        // Parse root of trust.

        HidlBuf verified_boot_key;

        auto result = parse_root_of_trust(attest_rec->data, attest_rec->length, &attestedVbKey_,

        keymaster_verified_boot_t verified_boot_state;

                                          &attestedVbState_, &attestedBootloaderState_,

        bool device_locked;

                                          &attestedVbmetaDigest_);

        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);

        ASSERT_EQ(result, ErrorCode::OK) << "Failed to parse root of trust.";

        ASSERT_EQ(result, ErrorCode::OK) << "Failed to parse root of trust.";

    }

    }