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

Add API for device provisioning server certificate

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

This is separate from the server certificate used for license
requests.

b/34211823

Test: Reran unittests. All tests other than some oemcrypto,
request_license_test passed. Those tests failed with or without this CL.

Change-Id: I23abdf276f8d3db9222f014175d0bb5094010a04
This commit is contained in:
Rahul Frias
2017-01-09 19:42:46 -08:00
parent b413037733
commit 2045316001
7 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -209,6 +209,13 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
virtual void set_service_certificate(const std::string& cert) {
service_certificate_ = cert;
}
virtual const std::string& device_provisioning_service_certificate() const {
return device_provisioning_service_certificate_;
}
virtual void set_device_provisioning_service_certificate(
const std::string& cert) {
device_provisioning_service_certificate_ = cert;
}
virtual bool use_privacy_mode() const { return use_privacy_mode_; }
virtual bool is_session_sharing_enabled() const {
return is_session_sharing_enabled_;
@@ -234,6 +241,7 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
std::string app_id_;
std::string security_level_;
std::string service_certificate_;
std::string device_provisioning_service_certificate_;
bool use_privacy_mode_;
bool is_session_sharing_enabled_;
uint32_t session_sharing_id_;

8
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -889,6 +889,13 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
virtual void set_service_certificate(const std::string& cert) {
service_certificate_ = cert;
}
virtual const std::string& device_provisioning_service_certificate() const {
return device_provisioning_service_certificate_;
}
virtual void set_device_provisioning_service_certificate(
const std::string& cert) {
device_provisioning_service_certificate_ = cert;
}
virtual bool use_privacy_mode() const { return use_privacy_mode_; }
virtual bool is_session_sharing_enabled() const {
return is_session_sharing_enabled_;
@@ -914,6 +921,7 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
std::string app_id_;
std::string security_level_;
std::string service_certificate_;
std::string device_provisioning_service_certificate_;
bool use_privacy_mode_;
bool is_session_sharing_enabled_;
uint32_t session_sharing_id_;