tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Only require RKP on T+ chipsets" into main am: 7bed173e4c am: ba6ec44f84

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727994

Change-Id: Iaf4ad7c57cb2737c09e7b6dc6f37835fc7fd3784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-25 20:32:25 +00:00 committed by Automerger Merge Worker
commit 6bae1ffa05
1 changed files with 6 additions and 9 deletions
Show stats 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 {
if (get_vsr_api_level() >= __ANDROID_API_T__) {
return true;
}
if (get_vsr_api_level() >= __ANDROID_API_S__) {
return SecLevel() != SecurityLevel::STRONGBOX;
}
return false;
// This is technically not a match to the requirements for S chipsets,
// 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
// support for RKP, so relax the test to match.
return get_vsr_api_level() >= __ANDROID_API_T__;
}
vector<uint32_t> KeyMintAidlTestBase::ValidKeySizes(Algorithm algorithm) {