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

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

Merge "Fix test assumption for KeyMint+RKP integration" am: 466f3c55 

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



Change-Id: I6637f260fe67f3a537659a720c1183b5b180fbca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87243fbb 466f3c55

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