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

Commit 42945693 authored by Sean Thomas's avatar Sean Thomas
Browse files

Separate existence of RKP VM from a specific check 

Previously, two tests were combined into one. There should be a test
that checks that the RKP VM instance is declared and another test that
checks that the RKP VM DICE chain and the KeyMint DICE chain both share
the same UDS public key.

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I7b293ed29acd0dfaf5d96697105cc4e7ca0f6a1d
parent d7e02b58

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

+1 −5
Original line number Diff line number Diff line
@@ -270,13 +270,9 @@ TEST(NonParameterizedTests, requireDiceOnDefaultInstanceIfStrongboxPresent) { 
 */

// @VsrTest = 7.1-003.001

TEST(NonParameterizedTests, equalUdsPubInDiceCertChainForRkpVmAndPrimaryKeyMintInstances) {

    int vendorApiLevel = get_vendor_api_level();

    if (vendorApiLevel < 202504 && !AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str())) {

    if (!AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str())) {

        GTEST_SKIP() << "The RKP VM (" << RKPVM_INSTANCE_NAME << ") is not present on this device.";

    }

    if (vendorApiLevel >= 202504) {

        ASSERT_TRUE(AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str()));

    }



    auto rkpVmRpc = getHandle<IRemotelyProvisionedComponent>(RKPVM_INSTANCE_NAME);

    ASSERT_NE(rkpVmRpc, nullptr) << "The RKP VM (" << RKPVM_INSTANCE_NAME