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

Commit bbee0080 authored by Seth Moore's avatar Seth Moore
Browse files

Fix test assumption for KeyMint+RKP integration 

It's not enough to verify that the system is running KeyMint 2+. We
also need to verify that the vendor partition has RKP support.

Since VSR 13+ requires KeyMint 2+, change the test assumption so that
we don't run the test against systems that may have shipped with an
older VSR chipset (which won't support RKP).

Bug: 263844771
Test: VtsAidlKeyMintTargetTest (on old and new device)
Change-Id: Iac15f69db1152851f5a92d3929cb258b1b1a6b02
parent 61841ef9

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1136,8 +1136,8 @@ TEST_P(NewKeyGenerationTest, RsaWithAttestation) { 
 * that has been generated using an associate IRemotelyProvisionedComponent.

 * that has been generated using an associate IRemotelyProvisionedComponent.

 */

 */

TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) {

TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) {

    if (AidlVersion() < 2) {

    if (get_vsr_api_level() < 32 || AidlVersion() < 2) {

        GTEST_SKIP() << "Only required starting with KeyMint v2";

        GTEST_SKIP() << "Only required for VSR 12+ and KeyMint 2+";

    }

    }





    // There should be an IRemotelyProvisionedComponent instance associated with the KeyMint

    // There should be an IRemotelyProvisionedComponent instance associated with the KeyMint
@@ -1214,8 +1214,8 @@ TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) { 
 * that has been generated using an associate IRemotelyProvisionedComponent.

 * that has been generated using an associate IRemotelyProvisionedComponent.

 */

 */

TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) {

TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) {

    if (AidlVersion() < 2) {

    if (get_vsr_api_level() < 32 || AidlVersion() < 2) {

        GTEST_SKIP() << "Only required starting with KeyMint v2";

        GTEST_SKIP() << "Only required for VSR 12+ and KeyMint 2+";

    }

    }





    // There should be an IRemotelyProvisionedComponent instance associated with the KeyMint

    // There should be an IRemotelyProvisionedComponent instance associated with the KeyMint