commit 5d531a26c02b8f411ab896b536828580a2f2205a
author nagendra modadugu <ngm@google.com> Tue Mar 31 15:55:01 2020 -0700
committer Tommy Chiu <tommychiu@google.com> Wed Apr 22 02:17:08 2020 +0000
tree 8fe0a012189fb6f77ef3ba5b5534f3e3954a2209
parent 08092046fbb8e23205e5900962d81693dd95a248

Fix StrongBoxOnly test

This test is expected to be run
on non-StrongBox instances.

Bug: 129282228
Test: StrongBoxOnly passes on TZ
Change-Id: Ia6b274d097b4c698904d1c51daed821188a50510

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
index 7ea3275..2af7775 100644
--- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -155,8 +155,8 @@
 using std::string;
 using DeviceUniqueAttestationTest = Keymaster4_1HidlTest;
 
-TEST_P(DeviceUniqueAttestationTest, StrongBoxOnly) {
-    if (SecLevel() != SecurityLevel::STRONGBOX) return;
+TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) {
+    if (SecLevel() == SecurityLevel::STRONGBOX) return;
 
     ASSERT_EQ(ErrorCode::OK, convert(GenerateKey(AuthorizationSetBuilder()
                                                          .Authorization(TAG_NO_AUTH_REQUIRED)