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

Commit 32e1615f authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Do not require StrongBox to implement RKP" am: fc746fb1 am:... 

Merge "Do not require StrongBox to implement RKP" am: fc746fb1 am: d3d5e859 am: 4e433f80 am: c6e81d24

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



Change-Id: Ib8170a5419f54a0e40aba466d7d9a813f2ba08d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2892bded c6e81d24

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

+19 −15
Original line number Diff line number Diff line
@@ -590,8 +590,7 @@ string device_suffix(const string& name) { 
    return name.substr(pos + 1);

}



bool matching_rp_instance(const string& km_name,

                          std::shared_ptr<IRemotelyProvisionedComponent>* rp) {

std::shared_ptr<IRemotelyProvisionedComponent> matching_rp_instance(const std::string& km_name) {

    string km_suffix = device_suffix(km_name);



    vector<string> rp_names =
@@ -601,11 +600,10 @@ bool matching_rp_instance(const string& km_name, 
        // KeyMint instance, assume they match.

        if (device_suffix(rp_name) == km_suffix && AServiceManager_isDeclared(rp_name.c_str())) {

            ::ndk::SpAIBinder binder(AServiceManager_waitForService(rp_name.c_str()));

            *rp = IRemotelyProvisionedComponent::fromBinder(binder);

            return true;

            return IRemotelyProvisionedComponent::fromBinder(binder);

        }

    }

    return false;

    return nullptr;

}



}  // namespace
@@ -1140,11 +1138,14 @@ TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) { 
        GTEST_SKIP() << "RKP support is not required on this platform";

    }



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

    // instance.

    std::shared_ptr<IRemotelyProvisionedComponent> rp;

    ASSERT_TRUE(matching_rp_instance(GetParam(), &rp))

            << "No IRemotelyProvisionedComponent found that matches KeyMint device " << GetParam();

    // Check for an IRemotelyProvisionedComponent instance associated with the

    // KeyMint instance.

    std::shared_ptr<IRemotelyProvisionedComponent> rp = matching_rp_instance(GetParam());

    if (rp == nullptr && SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Encountered StrongBox implementation that does not support RKP";

    }

    ASSERT_NE(rp, nullptr) << "No IRemotelyProvisionedComponent found that matches KeyMint device "

                           << GetParam();



    // Generate a P-256 keypair to use as an attestation key.

    MacedPublicKey macedPubKey;
@@ -1218,11 +1219,14 @@ TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) { 
        GTEST_SKIP() << "RKP support is not required on this platform";

    }



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

    // instance.

    std::shared_ptr<IRemotelyProvisionedComponent> rp;

    ASSERT_TRUE(matching_rp_instance(GetParam(), &rp))

            << "No IRemotelyProvisionedComponent found that matches KeyMint device " << GetParam();

    // Check for an IRemotelyProvisionedComponent instance associated with the

    // KeyMint instance.

    std::shared_ptr<IRemotelyProvisionedComponent> rp = matching_rp_instance(GetParam());

    if (rp == nullptr && SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Encountered StrongBox implementation that does not support RKP";

    }

    ASSERT_NE(rp, nullptr) << "No IRemotelyProvisionedComponent found that matches KeyMint device "

                           << GetParam();



    // Generate a P-256 keypair to use as an attestation key.

    MacedPublicKey macedPubKey;