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

Source release 19.5.0

Browse Source
This commit is contained in:
Cong Lin
2025-04-02 10:27:18 -07:00
parent 4407acee62
commit f7ec4fdeff
295 changed files with 32196 additions and 21748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
oemcrypto/odk/Android.bp
View File

@@ -113,6 +113,7 @@ cc_test {
"test/odk_golden_v16.cpp",
"test/odk_golden_v17.cpp",
"test/odk_golden_v18.cpp",
"test/odk_golden_v19.cpp",
"test/odk_test.cpp",
"test/odk_test_helper.cpp",
"test/odk_timer_test.cpp",

4
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
// behavior is for the server to restrict messages to at most this version
// number. The default is 19.4.
// number. The default is 19.5.
uint32_t maximum_major_version = 19;
uint32_t maximum_minor_version = 4;
uint32_t maximum_minor_version = 5;
bool operator==(const CoreMessageFeatures &other) const;
bool operator!=(const CoreMessageFeatures &other) const {

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

@@ -16,10 +16,10 @@ extern "C" {
/* The version of this library. */
#define ODK_MAJOR_VERSION 19
#define ODK_MINOR_VERSION 4
#define ODK_MINOR_VERSION 5
/* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v19.4 2024-11-04"
#define ODK_RELEASE_DATE "ODK v19.5 2025-03-11"
/* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16

3
oemcrypto/odk/src/core_message_deserialize.cpp
View File

@@ -77,7 +77,8 @@ bool ParseRequest(uint32_t message_type,
!(message_type == ODK_Renewal_Request_Type &&
core_message.message_type == ODK_Release_Request_Type) &&
!(message_type == ODK_Provisioning_Request_Type &&
core_message.message_type == ODK_Renewed_Provisioning_Request_Type)) {
(core_message.message_type == ODK_Renewed_Provisioning_Request_Type ||
core_message.message_type == ODK_Provisioning40_Request_Type))) {
return false;
}
// Verify that the amount of buffer we read, which is GetOffset, is not more

2
oemcrypto/odk/src/core_message_features.cpp
View File

@@ -33,7 +33,7 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
features.maximum_minor_version = 4; // 18.4
break;
case 19:
features.maximum_minor_version = 4; // 19.4
features.maximum_minor_version = 5; // 19.5
break;
default:
features.maximum_minor_version = 0;

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

@@ -277,7 +277,7 @@ OEMCryptoResult ODK_InitializeSessionValues(ODK_TimerLimits* timer_limits,
nonce_values->api_minor_version = 4;
break;
case 19:
nonce_values->api_minor_version = 4;
nonce_values->api_minor_version = 5;
break;
default:
nonce_values->api_minor_version = 0;

4333
oemcrypto/odk/test/odk_golden_v19.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

4
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},
{17, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 17, 2},
{18, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 18, 4},
{19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 4},
{19, ODK_MAJOR_VERSION, ODK_MINOR_VERSION, 19, 5},
// Here are some known good versions. Make extra sure they work.
{ODK_MAJOR_VERSION, 16, 3, 16, 3},
{ODK_MAJOR_VERSION, 16, 4, 16, 4},
@@ -1290,6 +1290,7 @@ std::vector<VersionParameters> TestCases() {
{ODK_MAJOR_VERSION, 19, 2, 19, 2},
{ODK_MAJOR_VERSION, 19, 3, 19, 3},
{ODK_MAJOR_VERSION, 19, 4, 19, 4},
{ODK_MAJOR_VERSION, 19, 5, 19, 5},
{0, 16, 3, 16, 3},
{0, 16, 4, 16, 4},
{0, 16, 5, 16, 5},
@@ -1302,6 +1303,7 @@ std::vector<VersionParameters> TestCases() {
{0, 19, 2, 19, 2},
{0, 19, 3, 19, 3},
{0, 19, 4, 19, 4},
{0, 19, 5, 19, 5},
};
return test_cases;
}

1
oemcrypto/odk/test/odk_test.gypi
View File

@@ -7,6 +7,7 @@
'odk_golden_v16.cpp',
'odk_golden_v17.cpp',
'odk_golden_v18.cpp',
'odk_golden_v19.cpp',
'odk_test.cpp',
'odk_test_helper.cpp',
'odk_test_helper.h',