summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-08-29 03:06:55 -0500
committerGerrit Code Review2018-08-29 03:06:55 -0500
commit516718071b764760055c80b35ec659a8ac81f7a9 (patch)
treeaea828c3956e9ef94f33781785a3e2ffe0f914f1
parent86104dcc18973a46cf606ac54d4d8bb17c0ab862 (diff)
parent0b166a2daf95026dbb2fabc193bf4600c452ead8 (diff)
downloadplatform-hardware-interfaces-516718071b764760055c80b35ec659a8ac81f7a9.tar.gz
platform-hardware-interfaces-516718071b764760055c80b35ec659a8ac81f7a9.tar.xz
platform-hardware-interfaces-516718071b764760055c80b35ec659a8ac81f7a9.zip
Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev
-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 ccb51ecf..61242645 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,
308 308
309 expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID, HidlBuf(app_id)); 309 expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID, HidlBuf(app_id));
310 310
311 EXPECT_GE(att_keymaster_version, 3U); 311 EXPECT_EQ(att_keymaster_version, 4U);
312 EXPECT_EQ(security_level, att_keymaster_security_level); 312 EXPECT_EQ(security_level, att_keymaster_security_level);
313 EXPECT_EQ(security_level, att_attestation_security_level); 313 EXPECT_EQ(security_level, att_attestation_security_level);
314 314