Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51c66c88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only require RKP on T+ chipsets" into main am: 7bed173e am:... 

Merge "Only require RKP on T+ chipsets" into main am: 7bed173e am: ba6ec44f am: 6bae1ffa am: 326dc8de

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



Change-Id: I3e3231c5a47a66fae4dca150ca9b1fe4de6844ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 430b9138 326dc8de

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+6 −9
Original line number Diff line number Diff line
@@ -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) {