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

Commit 35ad23a1 authored by Max Bires's avatar Max Bires Committed by Automerger Merge Worker
Browse files

Merge "Add VSR enforcement testing for IRPC versioning." am: f76f9b52 am:... 

Merge "Add VSR enforcement testing for IRPC versioning." am: f76f9b52 am: 567844a4 am: 24dea601

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



Change-Id: I34b8fb018d39648201ae679256e598a1952d7a73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b687277 24dea601

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+16 −0
Original line number Diff line number Diff line
@@ -783,4 +783,20 @@ TEST_P(CertificateRequestV2Test, NonEmptyRequest_testKeyInProdCert) { 


INSTANTIATE_REM_PROV_AIDL_TEST(CertificateRequestV2Test);



using VsrRequirementTest = VtsRemotelyProvisionedComponentTests;



INSTANTIATE_REM_PROV_AIDL_TEST(VsrRequirementTest);



TEST_P(VsrRequirementTest, VsrEnforcementTest) {

    RpcHardwareInfo hwInfo;

    ASSERT_TRUE(provisionable_->getHardwareInfo(&hwInfo).isOk());

    int vsr_api_level = get_vsr_api_level();

    if (vsr_api_level < 34) {

        GTEST_SKIP() << "Applies only to VSR API level 34 or newer, this device is: "

                     << vsr_api_level;

    }

    EXPECT_GE(hwInfo.versionNumber, 3)

            << "VSR 14+ requires IRemotelyProvisionedComponent v3 or newer.";

}



}  // namespace aidl::android::hardware::security::keymint::test