commit b56e3c3088ec8100ba9af5c0ff7df97049888ca0
author Shawn Willden <swillden@google.com> Wed Aug 15 16:43:05 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 15 16:43:05 2018 -0700
tree 442a9e7520937795a53dadabf0693c1b1c7f6491
parent 1d180f81fb8c40bede6582176a3bd404dd58cf3a
parent d6c58f733d75cbb6c61960f7ad85718209319a22

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

Change-Id: I9bf48d297e9cf79a50044223fa8bbe75e51acd44

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