Handle software keymaster implementations.

Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I0ca923fab3e312c576abc2f51f6dd28482176db7
This commit is contained in:
Shawn Willden
2018-08-15 12:10:18 -06:00
parent b4e998e812
commit 1404b6e8b0

View File

@@ -1083,7 +1083,7 @@ class NewKeyGenerationTest : public KeymasterHidlTest {
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));