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

Merge "Update ODK version to 19.1" into vic-widevine-dev

Browse Source
This commit is contained in:
Rahul Frias
2024-04-26 23:50:25 +00:00
committed by Android (Google) Code Review
parent 874fbfff5f 985eaacfb9
commit c4bb374653
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/oemcrypto/odk/include/core_message_features.h
View File

@@ -26,9 +26,9 @@ struct CoreMessageFeatures {
// This is the published version of the ODK Core Message library. The default // This is the published version of the ODK Core Message library. The default
// behavior is for the server to restrict messages to at most this version // behavior is for the server to restrict messages to at most this version
// number. The default is 19.0. // number. The default is 19.1.
uint32_t maximum_major_version = 19; uint32_t maximum_major_version = 19;
uint32_t maximum_minor_version = 0; uint32_t maximum_minor_version = 1;
bool operator==(const CoreMessageFeatures &other) const; bool operator==(const CoreMessageFeatures &other) const;
bool operator!=(const CoreMessageFeatures &other) const { bool operator!=(const CoreMessageFeatures &other) const {

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

@@ -16,10 +16,10 @@ extern "C" {
/* The version of this library. */ /* The version of this library. */
#define ODK_MAJOR_VERSION 19 #define ODK_MAJOR_VERSION 19
#define ODK_MINOR_VERSION 0 #define ODK_MINOR_VERSION 1
/* 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-03-22" #define ODK_RELEASE_DATE "ODK v19.1 2024-03-25"
/* 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_features.cpp
View File

@@ -33,7 +33,7 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
features.maximum_minor_version = 4; // 18.4 features.maximum_minor_version = 4; // 18.4
break; break;
case 19: case 19:
features.maximum_minor_version = 0; // 19.0 features.maximum_minor_version = 1; // 19.1
break; break;
default: default:
features.maximum_minor_version = 0; features.maximum_minor_version = 0;

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

@@ -276,6 +276,9 @@ OEMCryptoResult ODK_InitializeSessionValues(ODK_TimerLimits* timer_limits,
case 18: case 18:
nonce_values->api_minor_version = 4; nonce_values->api_minor_version = 4;
break; break;
case 19:
nonce_values->api_minor_version = 1;
break;
default: default:
nonce_values->api_minor_version = 0; nonce_values->api_minor_version = 0;
break; break;

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

@@ -1275,7 +1275,7 @@ std::vector<VersionParameters> TestCases() {
{16, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 16, 5}, {16, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 16, 5},
{17, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 17, 2}, {17, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 17, 2},
{18, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 18, 4}, {18, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 18, 4},
{19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 0}, {19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 1},
// Here are some known good versions. Make extra sure they work. // Here are some known good versions. Make extra sure they work.
{ODK_MAJOR_VERSION, 16, 3, 16, 3}, {ODK_MAJOR_VERSION, 16, 3, 16, 3},
{ODK_MAJOR_VERSION, 16, 4, 16, 4}, {ODK_MAJOR_VERSION, 16, 4, 16, 4},
@@ -1287,13 +1287,16 @@ std::vector<VersionParameters> TestCases() {
{ODK_MAJOR_VERSION, 18, 3, 18, 3}, {ODK_MAJOR_VERSION, 18, 3, 18, 3},
{ODK_MAJOR_VERSION, 18, 4, 18, 4}, {ODK_MAJOR_VERSION, 18, 4, 18, 4},
{ODK_MAJOR_VERSION, 19, 0, 19, 0}, {ODK_MAJOR_VERSION, 19, 0, 19, 0},
{ODK_MAJOR_VERSION, 19, 1, 19, 1},
{0, 16, 3, 16, 3}, {0, 16, 3, 16, 3},
{0, 16, 4, 16, 4}, {0, 16, 4, 16, 4},
{0, 16, 5, 16, 5}, {0, 16, 5, 16, 5},
{0, 17, 1, 17, 1}, {0, 17, 1, 17, 1},
{0, 17, 2, 17, 2}, {0, 17, 2, 17, 2},
{0, 18, 3, 18, 3}, // Change to 19 when the default version is updated. {0, 18, 3, 18, 3},
{0, 18, 4, 18, 4}, {0, 18, 4, 18, 4},
{0, 19, 0, 19, 0},
{0, 19, 1, 19, 1},
}; };
return test_cases; return test_cases;
} }