Merge "[avf] Adjust IRPC VTS tests to handle AVF in unsupported env" into main (561454a0) · Commits · e / os / android_hardware_interfaces

security/keymint/support/remote_prov_utils.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -520,6 +520,15 @@ ErrMsgOr<std::unique_ptr<cppbor::Map>> parseAndValidateDeviceInfo(
		std::to_string(info.versionNumber) + ").";
		}
		}
		// Bypasses the device info validation since the device info in AVF is currently
		// empty. Check b/299256925 for more information.
		//
		// TODO(b/300911665): This check is temporary and will be replaced once the markers
		// on the DICE chain become available. We need to determine if the CSR is from the
		// RKP VM using the markers on the DICE chain.
		if (info.uniqueId == "AVF Remote Provisioning 1") {
		return std::move(parsed);
		}

		std::string error;
		std::string tmp;

+13 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ constexpr int32_t VERSION_WITH_SUPPORTED_NUM_KEYS_IN_CSR = 3;

		constexpr uint8_t MIN_CHALLENGE_SIZE = 0;
		constexpr uint8_t MAX_CHALLENGE_SIZE = 64;
		const string RKP_VM_INSTANCE_NAME =
		"android.hardware.security.keymint.IRemotelyProvisionedComponent/avf";

		#define INSTANTIATE_REM_PROV_AIDL_TEST(name) \
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(name); \
		@@ -181,7 +183,12 @@ class VtsRemotelyProvisionedComponentTests : public testing::TestWithParam<std::
		provisionable_ = IRemotelyProvisionedComponent::fromBinder(binder);
		}
		ASSERT_NE(provisionable_, nullptr);
		ASSERT_TRUE(provisionable_->getHardwareInfo(&rpcHardwareInfo).isOk());
		auto status = provisionable_->getHardwareInfo(&rpcHardwareInfo);
		if (GetParam() == RKP_VM_INSTANCE_NAME &&
		status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {
		GTEST_SKIP() << "The RKP VM is not supported on this system.";
		}
		ASSERT_TRUE(status.isOk());
		}

		static vector<string> build_params() {
		@@ -207,7 +214,11 @@ TEST(NonParameterizedTests, eachRpcHasAUniqueId) {
		ASSERT_NE(rpc, nullptr);

		RpcHardwareInfo hwInfo;
		ASSERT_TRUE(rpc->getHardwareInfo(&hwInfo).isOk());
		auto status = rpc->getHardwareInfo(&hwInfo);
		if (hal == RKP_VM_INSTANCE_NAME && status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {
		GTEST_SKIP() << "The RKP VM is not supported on this system.";
		}
		ASSERT_TRUE(status.isOk());

		if (hwInfo.versionNumber >= VERSION_WITH_UNIQUE_ID_SUPPORT) {
		ASSERT_TRUE(hwInfo.uniqueId);