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

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

Merge "Adjust for library rename" am: 2524ba06 

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



Change-Id: Ifb3e49e4b717c203522df86f9b1e0c46f30b0f07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 043f6d6a 2524ba06

security/keymint/support/Android.bp

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

    ],

    whole_static_libs: [

        "libcert_request_validator_cxx",

        "libhwtrust_cxx",

    ],

    shared_libs: [

        "libbase",

security/keymint/support/remote_prov_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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();