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

Commit 8e9eaa96 authored by Joseph Jang's avatar Joseph Jang Committed by Automerger Merge Worker
Browse files

Merge "Add support testMode=false since KM RPC version 3" am: 7283acfd 

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



Change-Id: I4b59c6d0a5d5682848a8c97ceb5b61928b4306cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbc43248 7283acfd

identity/aidl/vts/VtsIWritableIdentityCredentialTests.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -125,7 +125,8 @@ TEST_P(IdentityCredentialTests, verifyAttestationSuccessWithRemoteProvisioning) 




    MacedPublicKey macedPublicKey;

    MacedPublicKey macedPublicKey;

    std::vector<uint8_t> attestationKey;

    std::vector<uint8_t> attestationKey;

    result = rpc->generateEcdsaP256KeyPair(/*testMode=*/true, &macedPublicKey, &attestationKey);

    // Start by RPC version 3, we don't support testMode=true. So just verify testMode=false here.

    result = rpc->generateEcdsaP256KeyPair(/*testMode=*/false, &macedPublicKey, &attestationKey);

    ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();

    ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();





    optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =

    optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =
@@ -176,7 +177,8 @@ TEST_P(IdentityCredentialTests, verifyRemotelyProvisionedKeyMayOnlyBeSetOnce) { 




    MacedPublicKey macedPublicKey;

    MacedPublicKey macedPublicKey;

    std::vector<uint8_t> attestationKey;

    std::vector<uint8_t> attestationKey;

    result = rpc->generateEcdsaP256KeyPair(/*testMode=*/true, &macedPublicKey, &attestationKey);

    // Start by RPC version 3, we don't support testMode=true. So just verify testMode=false here.

    result = rpc->generateEcdsaP256KeyPair(/*testMode=*/false, &macedPublicKey, &attestationKey);

    ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();

    ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();





    optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =

    optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =