From 13dab7dd615622fb92ba6a5dbc7f971a0689cd7d Mon Sep 17 00:00:00 2001
From: Cong Lin <conglin@google.com>
Date: Wed, 14 Feb 2024 13:08:08 -0800
Subject: [PATCH] Fix oemcrypto v19 android test and cppbor dependency

OEMCrypto_LoadProvisioning() has changed signature in v19.
Added lipcppbor library and utils to Android tests.

Test: build_all_unit_tests.sh
Bug: 324147162
Change-Id: Id890f97602f684e38d6e42cace9d5dc225958bec
---
 libwvdrmengine/oemcrypto/test/common.mk                  | 5 +++++
 libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk
index 48420a16..054127cb 100644
--- a/libwvdrmengine/oemcrypto/test/common.mk
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -28,8 +28,12 @@ LOCAL_SRC_FILES:= \
   oemcrypto_test_main.cpp \
   ota_keybox_test.cpp \
   ../../cdm/util/test/test_sleep.cpp \
+  ../util/src/bcc_validator.cpp \
+  ../util/src/cbor_validator.cpp \
+  ../util/src/device_info_validator.cpp \
   ../util/src/oemcrypto_ecc_key.cpp \
   ../util/src/oemcrypto_rsa_key.cpp \
+  ../util/src/signed_csr_payload_validator.cpp \
   ../util/src/wvcrc.cpp \
 
 LOCAL_C_INCLUDES += \
@@ -58,6 +62,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_SHARED_LIBRARIES := \
   libbase \
+  libcppbor_external \
   libcrypto \
   libdl \
   libbinder_ndk \
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp
index 29d4a023..9f1e8910 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp
@@ -46,8 +46,8 @@ TEST_F(OEMCryptoAndroidLMPTest, ValidKeyboxTest) {
  * or 4. */
 TEST_F(OEMCryptoAndroidLMPTest, RewrapDeviceRSAKeyImplemented) {
   ASSERT_NE(OEMCrypto_ERROR_NOT_IMPLEMENTED,
-            OEMCrypto_LoadProvisioning(0, nullptr, 0, 0, nullptr, 0, nullptr,
-                                       nullptr));
+            OEMCrypto_LoadProvisioning(0, nullptr, 0, nullptr, 0, 0, nullptr, 0,
+                                       nullptr, 0));
 }
 
 /** The Generic Crypto API functions are required for Android. */