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

Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad

Browse Source 
am: 555d7cdc83

Change-Id: Ib3c97a96e8482fafc888d71780daa047cc6428ac
This commit is contained in:
Rahul Frias
2019-05-13 09:49:24 -07:00
committed by android-build-merger
parent 878e39c740 555d7cdc83
commit f1bb063682
8 changed files with 621 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
View File

@@ -152,7 +152,8 @@ class MockCryptoSession : public TestCryptoSession {
class MockPolicyEngine : public PolicyEngine {
public:
MockPolicyEngine() : PolicyEngine("mock_session_id", NULL, NULL) {}
MockPolicyEngine(CryptoSession* crypto_session)
: PolicyEngine("mock_session_id", NULL, crypto_session) {}
// Leaving a place-holder for when PolicyEngine methods need to be mocked
};
@@ -181,7 +182,7 @@ class CdmSessionTest : public WvCdmTestBase {
cdm_session_->set_license_parser(license_parser_);
crypto_session_ = new NiceMock<MockCryptoSession>(&crypto_metrics_);
cdm_session_->set_crypto_session(crypto_session_);
policy_engine_ = new MockPolicyEngine();
policy_engine_ = new MockPolicyEngine(crypto_session_);
cdm_session_->set_policy_engine(policy_engine_);
file_handle_ = new MockDeviceFiles();
cdm_session_->set_file_handle(file_handle_);

881
libwvdrmengine/cdm/core/test/license_keys_unittest.cpp
View File

File diff suppressed because it is too large Load Diff

33
libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
View File

@@ -175,6 +175,10 @@ class PolicyEngineTest : public WvCdmTestBase {
expected_has_new_usable_key));
}
void SetCdmSecurityLevel(CdmSecurityLevel security_level) {
policy_engine_->SetSecurityLevelForTest(security_level);
}
metrics::CryptoMetrics dummy_metrics_;
NiceMock<HdcpOnlyMockCryptoSession> crypto_session_;
StrictMock<MockCdmEventListener> mock_event_listener_;
@@ -1718,20 +1722,29 @@ TEST_P(PolicyEngineKeySecurityLevelTest, CanUseKeyForSecurityLevel) {
ExpectSessionKeysChange(kKeyStatusUsable, true);
EXPECT_CALL(mock_event_listener_, OnExpirationUpdate(_, _));
SetCdmSecurityLevel(kSecurityLevelL1);
policy_engine_->SetLicense(license_);
EXPECT_EQ(param->expect_can_L1_use_key,
policy_engine_->CanUseKeyForSecurityLevel(kKeyId,
kSecurityLevelL1));
policy_engine_->CanUseKeyForSecurityLevel(kKeyId));
SetCdmSecurityLevel(kSecurityLevelL2);
policy_engine_->SetLicense(license_);
EXPECT_EQ(param->expect_can_L2_use_key,
policy_engine_->CanUseKeyForSecurityLevel(kKeyId,
kSecurityLevelL2));
policy_engine_->CanUseKeyForSecurityLevel(kKeyId));
SetCdmSecurityLevel(kSecurityLevelL3);
policy_engine_->SetLicense(license_);
EXPECT_EQ(param->expect_can_L3_use_key,
policy_engine_->CanUseKeyForSecurityLevel(kKeyId,
kSecurityLevelL3));
policy_engine_->CanUseKeyForSecurityLevel(kKeyId));
SetCdmSecurityLevel(kSecurityLevelUnknown);
policy_engine_->SetLicense(license_);
EXPECT_EQ(param->expect_can_level_unknown_use_key,
policy_engine_->CanUseKeyForSecurityLevel(kKeyId,
kSecurityLevelUnknown));
policy_engine_->CanUseKeyForSecurityLevel(kKeyId));
}
INSTANTIATE_TEST_CASE_P(
@@ -1852,6 +1865,8 @@ TEST_F(PolicyEngineKeyAllowedUsageTest, AllowedUsageBasic) {
content_key->set_id(kKeyId);
content_key->set_level(License::KeyContainer::HW_SECURE_ALL);
SetCdmSecurityLevel(kSecurityLevelL1);
// generic operator session key (sign)
AddOperatorSessionKey(kGenericKeyId, kEncryptNull, kDecryptNull, kSignTrue,
kVerifyNull);
@@ -1910,6 +1925,8 @@ TEST_F(PolicyEngineKeyAllowedUsageTest, AllowedUsageGeneric) {
another_content_key->set_id(kAnotherKeyId);
another_content_key->set_level(License::KeyContainer::HW_SECURE_CRYPTO);
SetCdmSecurityLevel(kSecurityLevelL1);
// generic operator session keys
AddOperatorSessionKey(kGenericSignKeyId, kEncryptNull, kDecryptNull,
kSignTrue, kVerifyNull);