Merge "Require keymaster4 attestations to contain the right version." into pi-dev

am: 4046722d02

Change-Id: I5a3005f265e3067e65b5bed671b14383906b4368
This commit is contained in:
Shawn Willden
2018-08-02 14:42:29 -07:00
committed by android-build-merger

View File

@@ -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);