From 746bab171248962927198dfaf055b2b7c033cc2c Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Thu, 7 Dec 2023 14:21:10 -0800 Subject: [PATCH] Remove unecessary fields from ODK_ParseRelease PiperOrigin-RevId: 588908051 Change-Id: Ia71536902cb19be29de1f984a74355d348de397e --- libwvdrmengine/oemcrypto/odk/include/odk.h | 8 +------- libwvdrmengine/oemcrypto/odk/include/odk_structs.h | 2 +- libwvdrmengine/oemcrypto/odk/src/odk.c | 4 +--- libwvdrmengine/oemcrypto/odk/test/odk_test.cpp | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libwvdrmengine/oemcrypto/odk/include/odk.h b/libwvdrmengine/oemcrypto/odk/include/odk.h index 7ecaa4ab..679d4e00 100644 --- a/libwvdrmengine/oemcrypto/odk/include/odk.h +++ b/libwvdrmengine/oemcrypto/odk/include/odk.h @@ -704,10 +704,6 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length, * the message buffer. * @param[in,out] nonce_values: pointer to the session's nonce data. These might * be updated if the server returns a lower API version. - * @param[in] seconds_since_license_requested: the time between the license - * being requested and the release being generated in seconds. - * @param[in] seconds_since_first_decrypt: The time since playback has started - * in seconds. * * @retval OEMCrypto_SUCCESS * @retval ODK_ERROR_CORE_MESSAGE: the message did not parse correctly, or there @@ -721,9 +717,7 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length, */ OEMCryptoResult ODK_ParseRelease(const uint8_t* message, size_t message_length, size_t core_message_length, - ODK_NonceValues* nonce_values, - int64_t seconds_since_license_requested, - int64_t seconds_since_first_decrypt); + ODK_NonceValues* nonce_values); /** * The function ODK_ParseProvisioning will parse the message and verify the diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h index 6f18d2a8..8926d164 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 2023-11-30" +#define ODK_RELEASE_DATE "ODK v19.0 2023-12-07" /* The lowest version number for an ODK message. */ #define ODK_FIRST_VERSION 16 diff --git a/libwvdrmengine/oemcrypto/odk/src/odk.c b/libwvdrmengine/oemcrypto/odk/src/odk.c index 59737db9..5faa2de6 100644 --- a/libwvdrmengine/oemcrypto/odk/src/odk.c +++ b/libwvdrmengine/oemcrypto/odk/src/odk.c @@ -524,9 +524,7 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length, OEMCryptoResult ODK_ParseRelease(const uint8_t* message, size_t message_length, size_t core_message_length, - ODK_NonceValues* nonce_values, - int64_t seconds_since_license_requested, - int64_t seconds_since_first_decrypt) { + ODK_NonceValues* nonce_values) { if (message == NULL || nonce_values == NULL) { return ODK_ERROR_CORE_MESSAGE; } diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp index 083ac72c..31caf251 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_test.cpp @@ -1173,9 +1173,7 @@ TEST_P(OdkVersionTest, ReleaseResponseRoundtrip) { params.seconds_since_first_decrypt; auto odk_parse_func = [&](const uint8_t* buf, size_t size) { OEMCryptoResult err = - ODK_ParseRelease(buf, size, size, &(params.core_message.nonce_values), - params.seconds_since_license_requested, - params.seconds_since_first_decrypt); + ODK_ParseRelease(buf, size, size, &(params.core_message.nonce_values)); return err; }; auto kdo_prepare_func = [&](ODK_ReleaseRequest& core_request,