Merge "Add support testMode=false since KM RPC version 3" am: 7283acfd9b am: 8e9eaa9665

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

Change-Id: I51289bfd0bf24f19d9ec98a2d8c0437d52d2309d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joseph Jang
2023-05-15 03:57:54 +00:00
committed by Automerger Merge Worker

View File

@@ -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 =