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

Document b/290249855 in ODK

Browse Source 
PiperOrigin-RevId: 546118816
Merged from https://widevine-internal-review.googlesource.com/177992

Change-Id: I6ab0b599a2d858f9451a5fbd3e3612275b729ee6
This commit is contained in:
Fred Gylys-Colwell
2023-07-06 16:12:49 -07:00
committed by Robert Shih
parent 414e928238
commit d0752047fc
3 changed files with 8 additions and 2 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 2 #define ODK_MINOR_VERSION 2
/* ODK Version string. Date changed automatically on each release. */ /* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v18.2 2023-07-05" #define ODK_RELEASE_DATE "ODK v18.2 2023-07-06"
/* 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

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

@@ -473,6 +473,9 @@ OEMCryptoResult ODK_ParseRenewal(const uint8_t* message, size_t message_length,
* a new one. We use the timestamp to make sure we have the latest request. * a new one. We use the timestamp to make sure we have the latest request.
* We only do this if playback has already started. This allows us to reload * We only do this if playback has already started. This allows us to reload
* an offline license and also reload a renewal before starting playback. * an offline license and also reload a renewal before starting playback.
* TODO: b/290249855 - This is reversed. It should be "!=" instead of "<".
* We will not fix this in the current release, because it is already in
* production code. Instead, this will be fixed in v19.
*/ */
if (clock_values->timer_status != ODK_CLOCK_TIMER_STATUS_LICENSE_LOADED && if (clock_values->timer_status != ODK_CLOCK_TIMER_STATUS_LICENSE_LOADED &&
clock_values->time_of_renewal_request < clock_values->time_of_renewal_request <

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

@@ -894,7 +894,10 @@ TEST(OdkTest, ParseRenewalErrorTimer) {
uint32_t buf_size = 0; uint32_t buf_size = 0;
ODK_BuildMessageBuffer(&(params.core_message), params.extra_fields, &buf, ODK_BuildMessageBuffer(&(params.core_message), params.extra_fields, &buf,
&buf_size); &buf_size);
params.clock_values.time_of_renewal_request = 0; // Set the time for the last renewal request, as seen in clock_values, to be
// after the time in the request.
// TODO: b/290249855 - This is reversed. It should be +5.
params.clock_values.time_of_renewal_request = params.playback_clock - 5;
OEMCryptoResult err = ODK_ParseRenewal( OEMCryptoResult err = ODK_ParseRenewal(
buf, buf_size, buf_size, &(params.core_message.nonce_values), buf, buf_size, buf_size, &(params.core_message.nonce_values),
params.system_time, &(params.timer_limits), &(params.clock_values), params.system_time, &(params.timer_limits), &(params.clock_values),