| commit | ac07618e73ecacfbafbd04ef4756056ea748bb9a | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Aug 02 14:46:29 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 02 14:46:29 2018 -0700 |
| tree | cf28ffe06d14ff8a5855515ff689cb8771d12cce | |
| parent | c21e610f4cd6c1d17d360ed38a9cd85f6381e0a0 [diff] | |
| parent | 375552ab5729210c9c9ab393d3f2c9d2011bdefc [diff] |
Merge "Require keymaster4 attestations to contain the right version." into pi-dev am: 4046722d02 am: 375552ab57 Change-Id: If5ebeaa6792d0f648c847247c6e96e0d99c30b33
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index ccb51ec..6124264 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -308,7 +308,7 @@ expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID, HidlBuf(app_id)); - EXPECT_GE(att_keymaster_version, 3U); + EXPECT_EQ(att_keymaster_version, 4U); EXPECT_EQ(security_level, att_keymaster_security_level); EXPECT_EQ(security_level, att_attestation_security_level);