From c54f43300d2759acbaada5819dc8a03af73e53a3 Mon Sep 17 00:00:00 2001
From: Andrew Scull <ascull@google.com>
Date: Sun, 15 Jan 2023 21:27:21 +0000
Subject: [PATCH] Adjust for library rename

libcert_request_validator is now called libhwtrust so update the
references to match.

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I3c73e2749996ef684da4567a3c86daf8b9c0fd09
---
 security/keymint/support/Android.bp            | 2 +-
 security/keymint/support/remote_prov_utils.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp
index 45e7c04970..b766f27960 100644
--- a/security/keymint/support/Android.bp
+++ b/security/keymint/support/Android.bp
@@ -67,7 +67,7 @@ cc_library {
         "android.hardware.security.rkp-V3-ndk",
     ],
     whole_static_libs: [
-        "libcert_request_validator_cxx",
+        "libhwtrust_cxx",
     ],
     shared_libs: [
         "libbase",
diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp
index 1cb9408145..04b5647161 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -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();