rkp_factory_extraction_tool: Add instance name in the JSON output
Since we maybe have more than 1 RKP instances on the device, add the
instance name in JSON for better visibility.
Bug: 223509807
Test: libkeymint_remote_prov_support_test
Change-Id: I1657ecb3abba886f2f7682997e72e428f3d6993e
diff --git a/provisioner/rkp_factory_extraction_tool.cpp b/provisioner/rkp_factory_extraction_tool.cpp
index c29bacb..0f45531 100644
--- a/provisioner/rkp_factory_extraction_tool.cpp
+++ b/provisioner/rkp_factory_extraction_tool.cpp
@@ -132,12 +132,12 @@
return getProdEekChain(curve);
}
-void writeOutput(const Array& csr) {
+void writeOutput(const std::string instance_name, const Array& csr) {
if (FLAGS_output_format == kBinaryCsrOutput) {
auto bytes = csr.encode();
std::copy(bytes.begin(), bytes.end(), std::ostream_iterator<char>(std::cout));
} else if (FLAGS_output_format == kBuildPlusCsr) {
- auto [json, error] = jsonEncodeCsrWithBuild(csr);
+ auto [json, error] = jsonEncodeCsrWithBuild(instance_name, csr);
if (!error.empty()) {
std::cerr << "Error JSON encoding the output: " << error;
exit(1);
@@ -187,7 +187,7 @@
}
auto request =
composeCertificateRequest(protectedData, verifiedDeviceInfo, challenge, keysToSignMac);
- writeOutput(request);
+ writeOutput(std::string(name), request);
}
} // namespace