widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix oemcrypto v19 android test and cppbor dependency

Browse Source 
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
This commit is contained in:
Cong Lin
2024-02-14 13:08:08 -08:00
committed by Robert Shih
parent 6d56eed754
commit 13dab7dd61
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/oemcrypto/test/common.mk
View File

@@ -28,8 +28,12 @@ LOCAL_SRC_FILES:= \
oemcrypto_test_main.cpp \ oemcrypto_test_main.cpp \
ota_keybox_test.cpp \ ota_keybox_test.cpp \
../../cdm/util/test/test_sleep.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_ecc_key.cpp \
../util/src/oemcrypto_rsa_key.cpp \ ../util/src/oemcrypto_rsa_key.cpp \
../util/src/signed_csr_payload_validator.cpp \
../util/src/wvcrc.cpp \ ../util/src/wvcrc.cpp \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
@@ -58,6 +62,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbase \ libbase \
libcppbor_external \
libcrypto \ libcrypto \
libdl \ libdl \
libbinder_ndk \ libbinder_ndk \

4
libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp
View File

@@ -46,8 +46,8 @@ TEST_F(OEMCryptoAndroidLMPTest, ValidKeyboxTest) {
* or 4. */ * or 4. */
TEST_F(OEMCryptoAndroidLMPTest, RewrapDeviceRSAKeyImplemented) { TEST_F(OEMCryptoAndroidLMPTest, RewrapDeviceRSAKeyImplemented) {
ASSERT_NE(OEMCrypto_ERROR_NOT_IMPLEMENTED, ASSERT_NE(OEMCrypto_ERROR_NOT_IMPLEMENTED,
OEMCrypto_LoadProvisioning(0, nullptr, 0, 0, nullptr, 0, nullptr, OEMCrypto_LoadProvisioning(0, nullptr, 0, nullptr, 0, 0, nullptr, 0,
nullptr)); nullptr, 0));
} }
/** The Generic Crypto API functions are required for Android. */ /** The Generic Crypto API functions are required for Android. */