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

Correct offline license handling

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

Licenses (offline, secure stops) that contain provider session tokens
are handled securely using usage tables. A recent fix did not correctly
handle offline licenses that do not contain a provider session token and
are not handled by the TEE.

b/62340248
Test: WV Unit/integration tests, GtsMediaTestCases

Change-Id: Ia1331fea9deff44dd1d93219b37f5bea4b8ee168
This commit is contained in:
Rahul Frias
2017-06-07 15:36:53 -07:00
parent ba346a1bea
commit 1857da2c8c
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,7 +363,6 @@ TEST_F(UsageTableHeaderTest, LoadEntry) {
TEST_F(UsageTableHeaderTest, UpdateEntry_CryptoSessionError) {
Init(kSecurityLevelL1, kUsageTableHeader, kUsageEntryInfoVector);
uint32_t usage_entry_number;
CdmUsageEntry usage_entry;
EXPECT_CALL(*crypto_session_, UpdateUsageEntry(NotNull(), NotNull()))
@@ -377,7 +376,6 @@ TEST_F(UsageTableHeaderTest, UpdateEntry_CryptoSessionError) {
TEST_F(UsageTableHeaderTest, UpdateEntry) {
Init(kSecurityLevelL1, kUsageTableHeader, kUsageEntryInfoVector);
uint32_t usage_entry_number;
CdmUsageEntry usage_entry;
EXPECT_CALL(*crypto_session_, UpdateUsageEntry(NotNull(), NotNull()))