commit d6c58f733d75cbb6c61960f7ad85718209319a22
author Shawn Willden <swillden@google.com> Wed Aug 15 16:42:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 15 16:42:24 2018 -0700
tree 1dcb3071d66c58ff4b42d67865e222ac5fda02e3
parent fb5b011ea18dbc05ea98fe4679ed38a271c6f24c
parent 66efa861454698ec297db16f9b38b7b32580caac

Handle software keymaster implementations. am: 1404b6e8b0
am: 66efa86145

Change-Id: I2ea4079310a4c826314fe62c0e912f3778b6dfea

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
index 70a5205..ccb5622 100644
--- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -1083,7 +1083,7 @@
         AuthorizationSet auths(keyCharacteristics.teeEnforced);
         auths.push_back(AuthorizationSet(keyCharacteristics.softwareEnforced));
 
-        if (!SupportsSymmetric() && asymmetric) {
+        if (IsSecure() && !SupportsSymmetric() && asymmetric) {
             EXPECT_TRUE(auths.Contains(TAG_ORIGIN, KeyOrigin::UNKNOWN));
         } else {
             EXPECT_TRUE(auths.Contains(TAG_ORIGIN, KeyOrigin::GENERATED));