commit dc77974152d3cab34c776908bdf5394662ee5049
author Tri Vo <trong@google.com> Fri Mar 18 19:16:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 18 19:16:03 2022 +0000
tree 6a88062cbc8a5eaefd6ff58f1c66376ae83d592f
parent 6b7c074e9785ef62977ab65eda1f808b0962dca9
parent 06d5f095be5b962373d998956a9cf0c20c0c444a

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

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

Change-Id: Id7674864552829342e959d9d651f2bb98008611a

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