tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "[avf] Adjust IRPC VTS tests to handle AVF in unsupported env"" into main am: 4020b2bd42 am: 1946bf76cc

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

Change-Id: If816027a99c7f39bcbde12a4fea86fccedef3a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alice Wang 2023-10-31 16:09:15 +00:00 committed by Automerger Merge Worker
commit 0eb5ea2ae4
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
security/keymint/support/remote_prov_utils.cpp
View file

@ -520,15 +520,6 @@ 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;

15
security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
View file

@ -55,8 +55,6 @@ 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); \
@ -183,12 +181,7 @@ class VtsRemotelyProvisionedComponentTests : public testing::TestWithParam<std::
provisionable_ = IRemotelyProvisionedComponent::fromBinder(binder);
}
ASSERT_NE(provisionable_, nullptr);
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());
ASSERT_TRUE(provisionable_->getHardwareInfo(&rpcHardwareInfo).isOk());
}
static vector<string> build_params() {
@ -214,11 +207,7 @@ TEST(NonParameterizedTests, eachRpcHasAUniqueId) {
ASSERT_NE(rpc, nullptr);
RpcHardwareInfo hwInfo;
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());
ASSERT_TRUE(rpc->getHardwareInfo(&hwInfo).isOk());
if (hwInfo.versionNumber >= VERSION_WITH_UNIQUE_ID_SUPPORT) {
ASSERT_TRUE(hwInfo.uniqueId);