summaryrefslogtreecommitdiffstats
path: root/keymaster
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2018-07-31 13:47:37 -0600
committerKeun Soo Yim <yim@google.com>2018-08-02 21:01:10 +0000
commit4e006c2b92be6ac71927b975b6725ddadf0b3342 (patch)
tree12cfa4c5cc8f07939bf9122b28fcf55ac23de971 /keymaster
parent8e920568371136b011c79e6c1d15bcb4c047d0a3 (diff)
downloadandroid_hardware_interfaces-4e006c2b92be6ac71927b975b6725ddadf0b3342.tar.gz
android_hardware_interfaces-4e006c2b92be6ac71927b975b6725ddadf0b3342.tar.bz2
android_hardware_interfaces-4e006c2b92be6ac71927b975b6725ddadf0b3342.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 Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9
Diffstat (limited to 'keymaster')
-rw-r--r--keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp2
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);