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

Commit e613dad4 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a... 

Merge "Change the way rkp tool obtains serial number" into main am: 40f1230a am: c3e1e032 am: c9674f65

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



Change-Id: I62f6ba3f15b62842bae2ba2e2ad37196f013ca5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb508f78 c9674f65

security/keymint/support/include/remote_prov/remote_prov_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct JsonOutput { 
 *   }

 */

JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name,

                                  const cppbor::Array& csr);

                                  const cppbor::Array& csr, const std::string serialno_prop);



/**

 * Parses a DeviceInfo structure from the given CBOR data. The parsed data is then validated to

security/keymint/support/remote_prov_utils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -337,9 +337,9 @@ ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc, 
    return result;

}



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

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

                                  const std::string serialno_prop) {

    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");
@@ -364,7 +364,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["serialno"] = ::android::base::GetProperty(serialno_prop, /*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
@@ -182,10 +182,11 @@ TEST(RemoteProvUtilsTest, GetProdEekChain) { 
}



TEST(RemoteProvUtilsTest, JsonEncodeCsr) {

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

    cppbor::Array array;

    array.add(1);



    auto [json, error] = jsonEncodeCsrWithBuild(std::string("test"), array);

    auto [json, error] = jsonEncodeCsrWithBuild(std::string("test"), array, kSerialNoProp);



    ASSERT_TRUE(error.empty()) << error;