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

Commit 466f3c55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix test assumption for KeyMint+RKP integration"

parents 7fb9baae bbee0080

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

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

 */

TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) {

    if (AidlVersion() < 2) {

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

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

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

    }



    // 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.

 */

TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) {

    if (AidlVersion() < 2) {

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

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

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

    }



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