commit c18ed2471287103f62b5c075570cdcd86fe8bcbc
author Tri Vo <trong@google.com> Fri Mar 18 18:44:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 18 18:44:50 2022 +0000
tree e90d1118dedcbdd7773ccdfcd0fd3c61324e3039
parent 4315111833cbaa6f49deb573f6f86cbb9d099f3a
parent 39f920bae38aee2249b04fe600dfa745f87b85b4

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

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

Change-Id: I09c96b1e9df172a76e1747f4b6687bd4211146ea

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