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

Merge "Label unused parameters in ODK" into main

Browse Source
This commit is contained in:
Kyle Zhang
2024-03-28 23:37:50 +00:00
committed by Android (Google) Code Review
parent 85223cf29a 53d0f5cd6a
commit 3c3e7cdb47
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/odk/include/odk_structs.h
View File

@@ -19,7 +19,7 @@ extern "C" {
#define ODK_MINOR_VERSION 0 #define ODK_MINOR_VERSION 0
/* ODK Version string. Date changed automatically on each release. */ /* 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. */ /* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16 #define ODK_FIRST_VERSION 16

2
libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
View File

@@ -143,6 +143,8 @@ bool CreateCoreReleaseResponse(const CoreMessageFeatures& features,
int64_t seconds_since_license_requested, int64_t seconds_since_license_requested,
int64_t seconds_since_first_decrypt, int64_t seconds_since_first_decrypt,
std::string* oemcrypto_core_message) { std::string* oemcrypto_core_message) {
(void)seconds_since_license_requested;
(void)seconds_since_first_decrypt;
ODK_ReleaseResponse release_response{}; ODK_ReleaseResponse release_response{};
if (!CreateResponseHeader(features, ODK_Release_Response_Type, if (!CreateResponseHeader(features, ODK_Release_Response_Type,
&release_response.core_message, core_request)) { &release_response.core_message, core_request)) {

4
libwvdrmengine/oemcrypto/odk/src/odk.c
View File

@@ -239,6 +239,10 @@ OEMCryptoResult ODK_PrepareCoreReleaseRequest(
uint32_t clock_security_level, int64_t seconds_since_license_requested, uint32_t clock_security_level, int64_t seconds_since_license_requested,
int64_t seconds_since_first_decrypt, ODK_ClockValues* clock_values, int64_t seconds_since_first_decrypt, ODK_ClockValues* clock_values,
uint64_t system_time_seconds) { 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 || if (core_message_size == NULL || nonce_values == NULL ||
clock_values == NULL) { clock_values == NULL) {
return ODK_ERROR_CORE_MESSAGE; return ODK_ERROR_CORE_MESSAGE;