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

Remove unecessary fields from ODK_ParseRelease

Browse Source 
PiperOrigin-RevId: 588908051
Change-Id: Ia71536902cb19be29de1f984a74355d348de397e
This commit is contained in:
Vicky Min
2023-12-07 14:21:10 -08:00
committed by Robert Shih
parent d2963a8cc5
commit 746bab1712
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/oemcrypto/odk/include/odk.h
View File

@@ -704,10 +704,6 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length,
* the message buffer. * the message buffer.
* @param[in,out] nonce_values: pointer to the session's nonce data. These might * @param[in,out] nonce_values: pointer to the session's nonce data. These might
* be updated if the server returns a lower API version. * 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 OEMCrypto_SUCCESS
* @retval ODK_ERROR_CORE_MESSAGE: the message did not parse correctly, or there * @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, OEMCryptoResult ODK_ParseRelease(const uint8_t* message, size_t message_length,
size_t core_message_length, size_t core_message_length,
ODK_NonceValues* nonce_values, ODK_NonceValues* nonce_values);
int64_t seconds_since_license_requested,
int64_t seconds_since_first_decrypt);
/** /**
* The function ODK_ParseProvisioning will parse the message and verify the * The function ODK_ParseProvisioning will parse the message and verify the

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 2023-11-30" #define ODK_RELEASE_DATE "ODK v19.0 2023-12-07"
/* 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

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

@@ -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, OEMCryptoResult ODK_ParseRelease(const uint8_t* message, size_t message_length,
size_t core_message_length, size_t core_message_length,
ODK_NonceValues* nonce_values, ODK_NonceValues* nonce_values) {
int64_t seconds_since_license_requested,
int64_t seconds_since_first_decrypt) {
if (message == NULL || nonce_values == NULL) { if (message == NULL || nonce_values == NULL) {
return ODK_ERROR_CORE_MESSAGE; return ODK_ERROR_CORE_MESSAGE;
} }

4
libwvdrmengine/oemcrypto/odk/test/odk_test.cpp
View File

@@ -1173,9 +1173,7 @@ TEST_P(OdkVersionTest, ReleaseResponseRoundtrip) {
params.seconds_since_first_decrypt; params.seconds_since_first_decrypt;
auto odk_parse_func = [&](const uint8_t* buf, size_t size) { auto odk_parse_func = [&](const uint8_t* buf, size_t size) {
OEMCryptoResult err = OEMCryptoResult err =
ODK_ParseRelease(buf, size, size, &(params.core_message.nonce_values), ODK_ParseRelease(buf, size, size, &(params.core_message.nonce_values));
params.seconds_since_license_requested,
params.seconds_since_first_decrypt);
return err; return err;
}; };
auto kdo_prepare_func = [&](ODK_ReleaseRequest& core_request, auto kdo_prepare_func = [&](ODK_ReleaseRequest& core_request,