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

Commit e03ea9f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ided4e9bb,I2808441c am: 19345258 

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



Change-Id: I85633ac488e57a56d190eaef4138ed6b1b0e2546
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86c0dd52 19345258

security/keymint/support/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ cc_test { 
        "android.hardware.security.rkp-V3-ndk",

        "libgmock",

        "libgtest_main",

        "libkeymint_remote_prov_support",

    ],

    defaults: [

        "keymint_use_latest_hal_aidl_ndk_shared",
@@ -95,6 +96,5 @@ cc_test { 
        "libcrypto",

        "libjsoncpp",

        "libkeymaster_portable",

        "libkeymint_remote_prov_support",

    ],

}

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);

}