From 3ab459195331df6e9b7a3723ac83f1b068f89e7b Mon Sep 17 00:00:00 2001 From: Cong Lin Date: Mon, 5 Feb 2024 14:03:09 -0800 Subject: [PATCH] L3 v19: Fix OEMCrypto_SetDecryptHash signature OEMCrypto_SetDecryptHash() is refactored in v19 to take less parameters. The implemention of this function has been done here: https://widevine-internal-review.git.corp.google.com/c/cdm/+/180670 Function signature in the leve3_adapter needs to be updated. Test: run_dynamic_level3 Bug: 320525541 Change-Id: Ieb3f3868f1753c246d1d5c36d069f8ef59fafdea --- libwvdrmengine/level3/include/haystack.h | 4 +--- libwvdrmengine/level3/src/level3_adapter.cpp | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libwvdrmengine/level3/include/haystack.h b/libwvdrmengine/level3/include/haystack.h index 6035342e..f512129e 100644 --- a/libwvdrmengine/level3/include/haystack.h +++ b/libwvdrmengine/level3/include/haystack.h @@ -111,9 +111,7 @@ OEMCryptoResult Haystack_LoadLicense_V18(OEMCrypto_SESSION session, const uint8_t* signature, size_t signature_length); OEMCryptoResult Haystack_SetDecryptHash(OEMCrypto_SESSION session, - uint32_t frame_number, - const uint8_t* hash, - size_t hash_length); + uint32_t frame_number, uint32_t crc32); OEMCryptoResult Haystack_GetHashErrorCode(OEMCrypto_SESSION session, uint32_t* failed_frame_number); OEMCryptoResult Haystack_BuildInformation(char* buffer, size_t* buffer_length); diff --git a/libwvdrmengine/level3/src/level3_adapter.cpp b/libwvdrmengine/level3/src/level3_adapter.cpp index f4e5ce37..7756c61c 100644 --- a/libwvdrmengine/level3/src/level3_adapter.cpp +++ b/libwvdrmengine/level3/src/level3_adapter.cpp @@ -250,10 +250,8 @@ OEMCryptoResult Level3_LoadLicense_V18(OEMCrypto_SESSION session, } OEMCryptoResult Level3_SetDecryptHash(OEMCrypto_SESSION session, - uint32_t frame_number, - const uint8_t* hash, size_t hash_length) { - return haystack::Haystack_SetDecryptHash(session, frame_number, hash, - hash_length); + uint32_t frame_number, uint32_t crc32) { + return haystack::Haystack_SetDecryptHash(session, frame_number, crc32); } OEMCryptoResult Level3_GetHashErrorCode(OEMCrypto_SESSION session,