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

Update core_message_util_test LicenseResponse18 unit test for variable max num keys change

Browse Source 
PiperOrigin-RevId: 557685272
Change-Id: Ib9e1b6c38d1f135c757e734c1c9f36d3913a21ca
This commit is contained in:
Vicky Min
2023-08-16 20:34:41 -07:00
committed by Robert Shih
parent 5c718ecb0d
commit c26d6d3c97
3 changed files with 2 additions and 6 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 0
/* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v19.0 2023-07-28"
#define ODK_RELEASE_DATE "ODK v19.0 2023-08-17"
/* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16

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

@@ -50,10 +50,6 @@ static void Pack_ODK_ParsedLicense(ODK_Message* msg,
ODK_Packing_ParsedLicense const* obj,
const ODK_NonceValues* nonce_values) {
/* hand-coded */
if (obj->key_array_length > ODK_MAX_NUM_KEYS) {
ODK_Message_SetStatus(msg, MESSAGE_STATUS_OVERFLOW_ERROR);
return;
}
Pack_OEMCrypto_Substring(msg, &obj->enc_mac_keys_iv);
Pack_OEMCrypto_Substring(msg, &obj->enc_mac_keys);
Pack_OEMCrypto_Substring(msg, &obj->pst);

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

@@ -1095,7 +1095,7 @@ TEST_P(OdkVersionTest, LicenseResponseRoundtripMoreThanMaxKeys) {
bool result =
CreateCoreLicenseResponse(features_, parsed_license, core_request,
request_hash_string, &oemcrypto_core_message);
EXPECT_FALSE(result);
EXPECT_TRUE(result);
delete[] buf;
delete[] zero;