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

Commit da179127 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "KeyMint: show vbmeta digest values on mismatch" into main am: 88da778d am: 34ea1a81 

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



Change-Id: Ia65a586313f852e2530a3b15f48a470c6d1f985d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 410d78f4 34ea1a81

security/keymint/aidl/vts/functional/BootloaderStateTest.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,9 @@ TEST_P(BootloaderStateTest, VbmetaDigest) { 
                                                 digest512.data());

                                                 digest512.data());





    ASSERT_TRUE((attestedVbmetaDigest_ == digest256) || (attestedVbmetaDigest_ == digest512))

    ASSERT_TRUE((attestedVbmetaDigest_ == digest256) || (attestedVbmetaDigest_ == digest512))

            << "Attested digest does not match computed digest.";

            << "Attested vbmeta digest (" << bin2hex(attestedVbmetaDigest_)

            << ") does not match computed digest (sha256: " << bin2hex(digest256)

            << ", sha512: " << bin2hex(digest512) << ").";

}

}





INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest);

INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest);