Merge "[factory_tool] Update factory tool with new CSR verification param" into main am: dd082da300
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3307455
Change-Id: Id2ed1f460c5a61b92b8931620d4acab26e47441a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/provisioner/rkp_factory_extraction_lib.cpp b/provisioner/rkp_factory_extraction_lib.cpp
index 2c2614d..37b81fd 100644
--- a/provisioner/rkp_factory_extraction_lib.cpp
+++ b/provisioner/rkp_factory_extraction_lib.cpp
@@ -191,9 +191,9 @@
exit(-1);
}
- auto result = verifyFactoryProtectedData(verifiedDeviceInfo, /*keysToSign=*/{}, keysToSignMac,
- protectedData, *eekChain, eekId,
- hwInfo.supportedEekCurve, irpc, challenge);
+ auto result = verifyFactoryProtectedData(
+ verifiedDeviceInfo, /*keysToSign=*/{}, keysToSignMac, protectedData, *eekChain, eekId,
+ hwInfo.supportedEekCurve, irpc, std::string(componentName), challenge);
if (!result) {
std::cerr << "Self test failed for IRemotelyProvisionedComponent '" << componentName
@@ -238,8 +238,8 @@
}
if (selfTest) {
- auto result =
- verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc, challenge, allowDegenerate);
+ auto result = verifyFactoryCsr(/*keysToSign=*/cppbor::Array(), csr, irpc,
+ std::string(componentName), challenge, allowDegenerate);
if (!result) {
std::cerr << "Self test failed for IRemotelyProvisionedComponent '" << componentName
<< "'. Error message: '" << result.message() << "'." << std::endl;