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

Merge "Only require RKP on T+ chipsets" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-25 19:08:06 +00:00
committed by Gerrit Code Review
parent 8a21830735 8be875e0d0
commit 7bed173e4c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
View File

@@ -1300,15 +1300,12 @@ std::pair<ErrorCode, vector<uint8_t>> KeyMintAidlTestBase::UpgradeKey(
} }
bool KeyMintAidlTestBase::IsRkpSupportRequired() const { bool KeyMintAidlTestBase::IsRkpSupportRequired() const {
if (get_vsr_api_level() >= __ANDROID_API_T__) { // This is technically not a match to the requirements for S chipsets,
return true; // however when S shipped there was a bug in the test that skipped the
} // tests if KeyMint 2 was not on the system. So we allowed many chipests
// to ship without RKP support. In T we hardened the requirements around
if (get_vsr_api_level() >= __ANDROID_API_S__) { // support for RKP, so relax the test to match.
return SecLevel() != SecurityLevel::STRONGBOX; return get_vsr_api_level() >= __ANDROID_API_T__;
}
return false;
} }
vector<uint32_t> KeyMintAidlTestBase::ValidKeySizes(Algorithm algorithm) { vector<uint32_t> KeyMintAidlTestBase::ValidKeySizes(Algorithm algorithm) {