From 53d0f5cd6a9f03e646b90f1382f7b6fbad480f49 Mon Sep 17 00:00:00 2001 From: John Bruce Date: Fri, 22 Mar 2024 12:23:04 -0700 Subject: [PATCH] Label unused parameters in ODK This is necessary so we can remove `-Wno-unused-parameter` in the CDM and OPK builds. PiperOrigin-RevId: 618255022 Merged from https://widevine-internal-review.googlesource.com/194110 Change-Id: I67b9b8cd27422c4b62d361d627fd1c05ed0cbdef --- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp | 2 ++ libwvdrmengine/oemcrypto/odk/src/odk.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h index c0989277..5f93e356 100644 --- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h +++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h @@ -19,7 +19,7 @@ extern "C" { #define ODK_MINOR_VERSION 0 /* ODK Version string. Date changed automatically on each release. */ -#define ODK_RELEASE_DATE "ODK v19.0 2024-02-23" +#define ODK_RELEASE_DATE "ODK v19.0 2024-03-22" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp index b2fc97bf..888b957a 100644 --- a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp +++ b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp @@ -143,6 +143,8 @@ bool CreateCoreReleaseResponse(const CoreMessageFeatures& features, int64_t seconds_since_license_requested, int64_t seconds_since_first_decrypt, std::string* oemcrypto_core_message) { + (void)seconds_since_license_requested; + (void)seconds_since_first_decrypt; ODK_ReleaseResponse release_response{}; if (!CreateResponseHeader(features, ODK_Release_Response_Type, &release_response.core_message, core_request)) { diff --git a/libwvdrmengine/oemcrypto/odk/src/odk.c b/libwvdrmengine/oemcrypto/odk/src/odk.c index 5faa2de6..3f4090f2 100644 --- a/libwvdrmengine/oemcrypto/odk/src/odk.c +++ b/libwvdrmengine/oemcrypto/odk/src/odk.c @@ -239,6 +239,10 @@ OEMCryptoResult ODK_PrepareCoreReleaseRequest( uint32_t clock_security_level, int64_t seconds_since_license_requested, int64_t seconds_since_first_decrypt, ODK_ClockValues* clock_values, uint64_t system_time_seconds) { + (void)status; + (void)clock_security_level; + (void)seconds_since_license_requested; + (void)seconds_since_first_decrypt; if (core_message_size == NULL || nonce_values == NULL || clock_values == NULL) { return ODK_ERROR_CORE_MESSAGE;