| commit | 66efa861454698ec297db16f9b38b7b32580caac | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Aug 15 15:29:30 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 15 15:29:30 2018 -0700 |
| tree | e329bb109200605b29dc81e1fa6b15289c4dac3d | |
| parent | 8cb970894df333fc4ecfe13b491d29979012d17d [diff] | |
| parent | 1404b6e8b00e8448738982436ec1ca827e378636 [diff] |
Handle software keymaster implementations. am: 1404b6e8b0 Change-Id: Ia054c30244e989cf60e3abb81304ed9fed0b2fbf
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));