Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes Ided4e9bb,I2808441c am: 19345258e5

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

Change-Id: I85633ac488e57a56d190eaef4138ed6b1b0e2546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-13 21:02:40 +00:00
committed by Automerger Merge Worker
parent 86c0dd525a 19345258e5
commit e03ea9f8ba
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/keymint/support/Android.bp
View File

@@ -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",
],
}

2
security/keymint/support/remote_prov_utils.cpp
View File

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

3
security/keymint/support/remote_prov_utils_test.cpp
View File

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