diff options
| author | Tommy Chiu <tommychiu@google.com> | 2022-03-09 04:24:46 +0000 |
|---|---|---|
| committer | Tommy Chiu <tommychiu@google.com> | 2022-03-10 12:17:39 +0800 |
| commit | cb7d3d075949ca400eed3fbcd0100248302c1778 (patch) | |
| tree | d51f2295da7592e8419fa0a0b6359bcd5eab2ec5 /security/keymint/support/remote_prov_utils.cpp | |
| parent | 26423c74aac10bbb3e2c634e4c3f99e8d7151875 (diff) | |
remote_prov_utils: Add instance name in the JSON output
Bug: 223509807
Test: libkeymint_remote_prov_support_test
Change-Id: I45d2ee46f6fe3c8a7da55c7cc0b04fc007ddea43
Diffstat (limited to 'security/keymint/support/remote_prov_utils.cpp')
| -rw-r--r-- | security/keymint/support/remote_prov_utils.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp index 0776282b27..a365a3b92f 100644 --- a/security/keymint/support/remote_prov_utils.cpp +++ b/security/keymint/support/remote_prov_utils.cpp @@ -408,7 +408,7 @@ ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc) { return result; } -JsonOutput jsonEncodeCsrWithBuild(const cppbor::Array& csr) { +JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name, const cppbor::Array& csr) { const std::string kFingerprintProp = "ro.build.fingerprint"; if (!::android::base::WaitForPropertyCreation(kFingerprintProp)) { @@ -432,6 +432,7 @@ JsonOutput jsonEncodeCsrWithBuild(const cppbor::Array& csr) { } Json::Value json(Json::objectValue); + json["name"] = instance_name; json["build_fingerprint"] = ::android::base::GetProperty(kFingerprintProp, /*default=*/""); json["csr"] = base64.data(); // Boring writes a NUL-terminated c-string |