From 0f2b0966c65a6d8393082f63c039d4de71d702a8 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Tue, 31 Jul 2018 13:47:37 -0600 Subject: [PATCH] Require KM4 attestations 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 Bug: 80246122 Change-Id: Ie2cd917af704b9f19de3537297b3a7e4f0c861e9 --- keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ccb51ecfb1..612426453a 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);