Handle software keymaster implementations. am: 1404b6e8b0

am: 66efa86145

Change-Id: I2ea4079310a4c826314fe62c0e912f3778b6dfea
This commit is contained in:
Shawn Willden 2018-08-15 16:42:24 -07:00 committed by android-build-merger
commit d6c58f733d

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