diff options
| author | Shawn Willden <swillden@google.com> | 2018-07-31 13:47:37 -0600 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2018-08-28 15:19:03 -0700 |
| commit | 0b166a2daf95026dbb2fabc193bf4600c452ead8 (patch) | |
| tree | fdbd54f4108c4e81e397b2efbf3d20b8b935509a /keymaster | |
| parent | 913053419eca7cb3c58e1d53772dcf9c32af990e (diff) | |
| download | android_hardware_interfaces-0b166a2daf95026dbb2fabc193bf4600c452ead8.tar.gz android_hardware_interfaces-0b166a2daf95026dbb2fabc193bf4600c452ead8.tar.bz2 android_hardware_interfaces-0b166a2daf95026dbb2fabc193bf4600c452ead8.zip | |
Require keymaster4 attestations to contain the right version.
Note that devices with KM4 will fail to pass VTS after this
lands, until the fix from Qualcomm arrives.
Test: VtsHalKeymasterV4_0TargetTest
Bug: 112040197
Merged-In: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
(cherry picked from commit 4e006c2b92be6ac71927b975b6725ddadf0b3342)
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 ccb51ecfb..612426453 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 @@ bool verify_attestation_record(const string& challenge, const string& app_id, 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); |