| commit | 375552ab5729210c9c9ab393d3f2c9d2011bdefc | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Aug 02 14:42:29 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 02 14:42:29 2018 -0700 |
| tree | 68b06784b519d261d8a9f99518737f0441734aed | |
| parent | 8883efde72e3ee2c17570bfad63633eea3fa611b [diff] | |
| parent | 4046722d02e343411eccc15d44b903b95603cb95 [diff] |
Merge "Require keymaster4 attestations to contain the right version." into pi-dev am: 4046722d02 Change-Id: I5a3005f265e3067e65b5bed671b14383906b4368
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 ccb51ec..6124264 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 @@ 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);