Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-03 12:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of KM3 attestations.

Browse Source 
Test: Manually tested
Bug: 37318025
Change-Id: I91c0c0fe6d36fb4a02d6b58a3b0836a6f8996012
This commit is contained in:
Shawn Willden
2017-04-10 17:19:15 -06:00
parent 5df7894213
commit 4b93bb21dc
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
View File

@@ -892,15 +892,6 @@ class KeymasterHidlTest : public ::testing::VtsHalHidlTargetTestBase {
static hidl_string author_;
};
uint32_t expected_keymaster_version() {
if (!KeymasterHidlTest::IsSecure()) return 2; // SW is KM2
uint32_t keymaster_version = 0;
if (KeymasterHidlTest::SupportsSymmetric()) keymaster_version = 1;
if (KeymasterHidlTest::SupportsAttestation()) keymaster_version = 2;
return keymaster_version;
}
bool verify_attestation_record(const string& challenge, AuthorizationSet expected_sw_enforced,
AuthorizationSet expected_tee_enforced,
const hidl_vec<uint8_t>& attestation_cert) {
@@ -933,8 +924,25 @@ bool verify_attestation_record(const string& challenge, AuthorizationSet expecte
&att_tee_enforced, //
&att_unique_id));
EXPECT_EQ(1U, att_attestation_version);
EXPECT_EQ(expected_keymaster_version(), att_keymaster_version);
if (att_keymaster_version == 3) {
EXPECT_EQ(2U, att_attestation_version);
} else {
EXPECT_EQ(1U, att_attestation_version);
}
if (!KeymasterHidlTest::IsSecure()) {
// SW is KM2
EXPECT_EQ(att_keymaster_version, 2U);
}
if (KeymasterHidlTest::SupportsSymmetric()) {
EXPECT_GE(att_keymaster_version, 1U);
}
if (KeymasterHidlTest::SupportsAttestation()) {
EXPECT_GE(att_keymaster_version, 2U);
}
EXPECT_EQ(KeymasterHidlTest::IsSecure() ? SecurityLevel::TRUSTED_ENVIRONMENT
: SecurityLevel::SOFTWARE,
att_keymaster_security_level);