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 "Adjust for library rename" am: 2524ba06a2

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

Change-Id: Ifb3e49e4b717c203522df86f9b1e0c46f30b0f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-18 22:06:45 +00:00
committed by Automerger Merge Worker
parent 043f6d6a12 2524ba06a2
commit dba75688eb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ cc_library {
"android.hardware.security.rkp-V3-ndk",
],
whole_static_libs: [
"libcert_request_validator_cxx",
"libhwtrust_cxx",
],
shared_libs: [
"libbase",

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

@@ -23,8 +23,8 @@
#include <aidl/android/hardware/security/keymint/RpcHardwareInfo.h>
#include <android-base/properties.h>
#include <cert_request_validator/cert_request_validator.h>
#include <cppbor.h>
#include <hwtrust/hwtrust.h>
#include <json/json.h>
#include <keymaster/km_openssl/ec_key.h>
#include <keymaster/km_openssl/ecdsa_operation.h>
@@ -292,7 +292,7 @@ bytevec getProdEekChain(int32_t supportedEekCurve) {
ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc) {
auto encodedBcc = bcc->encode();
auto chain = cert_request_validator::DiceChain::verify(encodedBcc);
auto chain = hwtrust::DiceChain::verify(encodedBcc);
if (!chain.ok()) return chain.error().message();
auto keys = chain->cose_public_keys();
if (!keys.ok()) return keys.error().message();