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

Replace DeviceFiles::LicenseState with CdmOfflineLicenseState

Browse Source 
[ Merge of http://go/wvgerrit/123003 ]

Bug: 160006474
Test: WV unit/integration tests
Change-Id: Ied813f58405fcac44f0543f715ab2175129bbf9c
This commit is contained in:
Rahul Frias
2021-04-22 02:53:12 -07:00
parent 46a3f6c608
commit 4c4e746e57
6 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libwvdrmengine/cdm/core/test/device_files_unittest.cpp
View File

@@ -1605,7 +1605,7 @@ constexpr size_t kNumberOfDefaultCertificates =
struct LicenseInfo {
std::string key_set_id;
DeviceFiles::LicenseState license_state;
CdmOfflineLicenseState license_state;
std::string pssh_data;
std::string key_request;
std::string key_response;
@@ -1630,7 +1630,7 @@ struct LicenseInfo {
const LicenseInfo kLicenseTestData[] = {
// license 0
{"ksid54C57C966E23CEF5", DeviceFiles::kLicenseStateActive,
{"ksid54C57C966E23CEF5", kLicenseStateActive,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"C4D07A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD"
@@ -1807,7 +1807,7 @@ const LicenseInfo kLicenseTestData[] = {
"FF232D23F98B72F1DCE96A")},
// license 1
{"ksidC8EAA2579A282EB0", DeviceFiles::kLicenseStateReleasing,
{"ksidC8EAA2579A282EB0", kLicenseStateReleasing,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"C4D07A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD"
@@ -1990,7 +1990,7 @@ const LicenseInfo kLicenseTestData[] = {
"17B2F8B2D7511C9DE89A87CB5208AB")},
// license 2
{"ksidE8C37662C88DC673", DeviceFiles::kLicenseStateReleasing,
{"ksidE8C37662C88DC673", kLicenseStateReleasing,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"C4D07A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD"
@@ -2175,7 +2175,7 @@ const LicenseInfo kLicenseTestData[] = {
"F")},
// license 3
{"ksidF991C5F45E98CB97", DeviceFiles::kLicenseStateActive,
{"ksidF991C5F45E98CB97", kLicenseStateActive,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"FA0E5DFC3DE9A34BA5F08BE349553C319A9FB274905A8770ADC9CA4A2CBC"
@@ -2418,7 +2418,7 @@ constexpr size_t kNumberOfLicenses = ArraySize(kLicenseTestData);
// The data is used to test license-related functions.
const LicenseInfo kLicenseUpdateTestData[] = {
// active license
{"key_set_id_: ksid2A048BC7FAEC885A", DeviceFiles::kLicenseStateActive,
{"key_set_id_: ksid2A048BC7FAEC885A", kLicenseStateActive,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"C4D07A7D5076189EDFB68F05228E023082010A0282010100CC1715C81AD3"
@@ -2601,8 +2601,8 @@ const LicenseInfo kLicenseUpdateTestData[] = {
"766D60B07CBC")},
// license being released. all fields are identical except for license
// state and hashed file data
{"", DeviceFiles::kLicenseStateReleasing, "", "", "", "", "", "", 0, 0, 0,
"", "", 15, "", CryptoWrappedKey::kUninitialized, "",
{"", kLicenseStateReleasing, "", "", "", "", "", "", 0, 0, 0, "", "", 15,
"", CryptoWrappedKey::kUninitialized, "",
a2bs_hex(
"0AEE150802100122E7150802121408011210303132333435363738394142434445461"
"A9D0E080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591BC4D0"
@@ -2694,7 +2694,7 @@ const LicenseInfo kLicenseUpdateTestData[] = {
const LicenseInfo kLicenseAppParametersBackwardsCompatibilityTestData = {
"ksid54C57C966E23CEF5",
DeviceFiles::kLicenseStateActive,
kLicenseStateActive,
a2bs_hex("0801121030313233343536373839414243444546"),
a2bs_hex("080112950C0AD70B080112EF090AB002080212103E560EC5335E346F591B"
"C4D07A7D507618A5D3A68F05228E023082010A0282010100A947904B8DBD"
@@ -3806,7 +3806,7 @@ class DeviceFilesTest : public ::testing::Test {
app_parameters_len += itr->first.length();
app_parameters_len += itr->second.length();
}
return sizeof(DeviceFiles::LicenseState) + data.pssh_data.size() +
return sizeof(CdmOfflineLicenseState) + data.pssh_data.size() +
data.key_request.size() + data.key_response.size() +
data.key_renewal_request.size() + data.key_renewal_response.size() +
data.key_release_url.size() + 3 * sizeof(int64_t) +

3
libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
View File

@@ -208,8 +208,7 @@ std::vector<CdmUsageEntryInfo> kUsageEntryInfoVector;
std::vector<CdmUsageEntryInfo> k10UsageEntryInfoVector;
std::vector<CdmUsageEntryInfo> kOverFullUsageEntryInfoVector;
const DeviceFiles::LicenseState kActiveLicenseState =
DeviceFiles::kLicenseStateActive;
const CdmOfflineLicenseState kActiveLicenseState = kLicenseStateActive;
const CdmInitData kPsshData = "pssh data";
const CdmKeyMessage kKeyRequest = "key request";
const CdmKeyResponse kKeyResponse = "key response";