| commit | dd4358f667fa74279588c66d1a945b77e7ce9c46 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Thu Jun 08 01:52:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 01:52:46 2017 +0000 |
| tree | 3236beb38952d9db715dcdea92eb437427e0858e | |
| parent | b37a40891cb533489b151da0e555d8cfbd9e9372 [diff] | |
| parent | db5b71c924e8640adaa5e55aa46cd7313ba03c71 [diff] |
Fix expected attestation version. am: 538b7d85ef am: db5b71c924 Change-Id: I65916750483228b74b4b65a5379fdf0ec06f4816
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 d4360d8..b86d957 100644 --- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -967,11 +967,7 @@ &att_tee_enforced, // &att_unique_id)); - if (att_keymaster_version == 3) { - EXPECT_EQ(2U, att_attestation_version); - } else { - EXPECT_EQ(1U, att_attestation_version); - } + EXPECT_TRUE(att_attestation_version == 1 || att_attestation_version == 2); expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID, HidlBuf(app_id));