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

Roll ODK version number to 19.0

Browse Source 
PiperOrigin-RevId: 551966786
Change-Id: Ib3eb3423112a340abb25cddfdc2d6d43ad2ce6f1
This commit is contained in:
Vicky Min
2023-07-28 15:34:12 -07:00
committed by Robert Shih
parent 6c7988f8c9
commit 41942e1014
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/oemcrypto/odk/src/core_message_deserialize.cpp
View File

@@ -167,11 +167,12 @@ bool CoreProvisioningRequestFromMessage(
ODK_NonceValues nonce;
if (!GetNonceFromMessage(oemcrypto_core_message, &nonce)) return false;
if (nonce.api_major_version == 18) {
if (nonce.api_major_version >= 18) {
// Use special case unpacker for v18.0
const auto unpacker = nonce.api_minor_version == 0
? Unpack_ODK_PreparedProvisioningRequestV180
: Unpack_ODK_PreparedProvisioningRequest;
const auto unpacker =
nonce.api_minor_version == 0 && nonce.api_major_version == 18
? Unpack_ODK_PreparedProvisioningRequestV180
: Unpack_ODK_PreparedProvisioningRequest;
ODK_PreparedProvisioningRequest prepared_provision = {};
if (!ParseRequest(ODK_Provisioning_Request_Type, oemcrypto_core_message,

3
libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
View File

@@ -32,6 +32,9 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
case 18:
features.maximum_minor_version = 4; // 18.4
break;
case 19:
features.maximum_minor_version = 0; // 19.0
break;
default:
features.maximum_minor_version = 0;
}

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

@@ -423,7 +423,7 @@ OEMCryptoResult ODK_ParseLicense(
*timer_limits = parsed_license->timer_limits;
/* And update the clock values state. */
clock_values->timer_status = ODK_CLOCK_TIMER_STATUS_LICENSE_LOADED;
if (nonce_values->api_major_version == 18 && license_load) {
if (nonce_values->api_major_version >= 18 && license_load) {
err = ODK_AttemptFirstPlayback(system_time_seconds, timer_limits,
clock_values, timer_value);
return err;