commit 39f920bae38aee2249b04fe600dfa745f87b85b4
author Tri Vo <trong@google.com> Fri Mar 18 18:30:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 18 18:30:36 2022 +0000
tree 47e913837c4ac124f2234c65c84ae7b16d0b3558
parent 96d037bf93da51054d69389c3c699946f3ab3bab
parent a26f8cb3169b1dc4958e4d06d01f7fc9e70e1b78

Merge "KeyMint VTS: Expect empty key if boot state unverfied" am: a26f8cb316

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

Change-Id: Ib537d307ffe6e764cc0737c8fab0b8944808f4ef

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

diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
index c174c02..4ab989b 100644
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -1619,7 +1619,7 @@
         EXPECT_EQ(verified_boot_state, VerifiedBoot::FAILED);
     } else {
         EXPECT_EQ(verified_boot_state, VerifiedBoot::UNVERIFIED);
-        EXPECT_NE(0, memcmp(verified_boot_key.data(), empty_boot_key.data(),
+        EXPECT_EQ(0, memcmp(verified_boot_key.data(), empty_boot_key.data(),
                             verified_boot_key.size()));
     }