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

Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 am: 7f60034c16

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

Change-Id: I501cc0546fc83e15bebb350c1f45421bba7f1fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Seth Moore 2023-09-06 05:37:01 +00:00 committed by Automerger Merge Worker
commit 7c9a6af71c
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

@ -1295,15 +1295,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) {