Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eacb1c16 authored by Daniel Angell's avatar Daniel Angell
Browse files

Add ro.serialno sysprop to JSON output 

To help with error reporting on the RKP servers in the future it
will be helpful to be able to address CSRs by serial number when
possible.

Bug: 264302050
Test: libkeymint_remote_prov_support_test and sent JSON to server
Change-Id: I2808441c200d0679e618580abc464cd3c71c220e
parent 45d79216

security/keymint/support/remote_prov_utils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc) { 


JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name, const cppbor::Array& csr) {

    const std::string kFingerprintProp = "ro.build.fingerprint";

    const std::string kSerialNoProp = "ro.serialno";



    if (!::android::base::WaitForPropertyCreation(kFingerprintProp)) {

        return JsonOutput::Error("Unable to read build fingerprint");
@@ -441,6 +442,7 @@ JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name, const cppbor: 
    Json::Value json(Json::objectValue);

    json["name"] = instance_name;

    json["build_fingerprint"] = ::android::base::GetProperty(kFingerprintProp, /*default=*/"");

    json["serialno"] = ::android::base::GetProperty(kSerialNoProp, /*default=*/"");

    json["csr"] = base64.data();  // Boring writes a NUL-terminated c-string



    Json::StreamWriterBuilder factory;

security/keymint/support/remote_prov_utils_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ TEST(RemoteProvUtilsTest, JsonEncodeCsr) { 


    std::string expected = R"({"build_fingerprint":")" +

                           ::android::base::GetProperty("ro.build.fingerprint", /*default=*/"") +

                           R"(","csr":"gQE=","name":"test"})";

                           R"(","csr":"gQE=","name":"test","serialno":")" +

                           ::android::base::GetProperty("ro.serialno", /*default=*/"") + R"("})";



    ASSERT_EQ(json, expected);

}