Forward declaration of DrmRootCertificate.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=227608878
This commit is contained in:
Fang Yu
2019-01-02 17:29:54 -08:00
parent 79f14e6e0b
commit 10717f84d4
6 changed files with 18 additions and 8 deletions

View File

@@ -20,7 +20,7 @@ git_repository(
git_repository( git_repository(
name = "com_google_protobuf", name = "com_google_protobuf",
remote = "https://github.com/google/protobuf.git", remote = "https://github.com/google/protobuf.git",
tag = "v3.5.0", tag = "v3.6.1.3",
) )
git_repository( git_repository(
@@ -31,7 +31,7 @@ git_repository(
git_repository( git_repository(
name = "gflags_repo", name = "gflags_repo",
commit = "fe57e5af4db74ab298523f06d2c43aa895ba9f98", # 2016-07-20 commit = "e171aa2d15ed9eb17054558e0b3a6a413bb01067", # 2018-11-11
remote = "https://github.com/gflags/gflags.git", remote = "https://github.com/gflags/gflags.git",
) )

View File

@@ -16,7 +16,6 @@ filegroup(
name = "binary_release_files", name = "binary_release_files",
srcs = [ srcs = [
"certificate_type.h", "certificate_type.h",
"drm_root_certificate.h",
"status.h", "status.h",
], ],
) )

View File

@@ -56,6 +56,7 @@ cc_library(
"//base", "//base",
"@abseil_repo//absl/strings", "@abseil_repo//absl/strings",
"//common:certificate_type", "//common:certificate_type",
"//common:drm_root_certificate",
"//common:error_space", "//common:error_space",
"//sdk/external/common/wvpl:wvpl_sdk_environment", "//sdk/external/common/wvpl:wvpl_sdk_environment",
"//sdk/external/common/wvpl:wvpl_sdk_session", "//sdk/external/common/wvpl:wvpl_sdk_session",

View File

@@ -10,6 +10,7 @@
#include "absl/strings/escaping.h" #include "absl/strings/escaping.h"
#include "common/certificate_type.h" #include "common/certificate_type.h"
#include "common/drm_root_certificate.h"
#include "common/error_space.h" #include "common/error_space.h"
#include "media_cas_proxy_sdk/external/common/wvpl/wvpl_cas_proxy_session.h" #include "media_cas_proxy_sdk/external/common/wvpl/wvpl_cas_proxy_session.h"

View File

@@ -12,12 +12,15 @@
#include "absl/synchronization/mutex.h" #include "absl/synchronization/mutex.h"
#include "common/aes_cbc_util.h" #include "common/aes_cbc_util.h"
#include "common/device_status_list.h" #include "common/device_status_list.h"
#include "common/drm_root_certificate.h"
#include "common/drm_service_certificate.h" #include "common/drm_service_certificate.h"
#include "common/error_space.h" #include "common/error_space.h"
#include "common/sha_util.h" #include "common/sha_util.h"
#include "common/status.h" #include "common/status.h"
#include "license_server_sdk/internal/generate_error_response.h" #include "license_server_sdk/internal/generate_error_response.h"
#include "protos/public/device_certificate_status.pb.h"
#include "protos/public/errors.pb.h" #include "protos/public/errors.pb.h"
#include "protos/public/provisioned_device_info.pb.h"
using widevine::DeviceCertificateStatus; using widevine::DeviceCertificateStatus;
using widevine::DeviceCertificateStatusList; using widevine::DeviceCertificateStatusList;
@@ -71,6 +74,9 @@ ProvisionedDeviceInfoMap& GetProvisionedDeviceInfoMap() {
return *device_info_map; return *device_info_map;
} }
} // namespace } // namespace
WvPLSDKEnvironment::~WvPLSDKEnvironment() = default;
WvPLStatus WvPLSDKEnvironment::SetDrmServiceCertificate( WvPLStatus WvPLSDKEnvironment::SetDrmServiceCertificate(
const std::string& service_certificate, const std::string& service_private_key, const std::string& service_certificate, const std::string& service_private_key,
const std::string& service_private_key_passphrase) { const std::string& service_private_key_passphrase) {

View File

@@ -12,11 +12,13 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "common/drm_root_certificate.h"
#include "sdk/external/common/wvpl/wvpl_types.h" #include "sdk/external/common/wvpl/wvpl_types.h"
#include "protos/public/device_certificate_status.pb.h"
#include "protos/public/provisioned_device_info.pb.h"
namespace widevine {
class DeviceCertificateStatusList;
class DrmRootCertificate;
class ProvisionedDeviceInfo;
} // namespace widevine
namespace widevine_server { namespace widevine_server {
namespace wv_pl_sdk { namespace wv_pl_sdk {
@@ -38,8 +40,7 @@ const char kDrmCertificateType[] = "drm_certificate_type";
*/ */
class WvPLSDKEnvironment { class WvPLSDKEnvironment {
public: public:
virtual ~WvPLSDKEnvironment() {} virtual ~WvPLSDKEnvironment();
static void SetConfigValue(const std::map<std::string, std::string>& config_values);
// Generates a license response containing a message generated in response to // Generates a license response containing a message generated in response to
// an error condition. |create_session_status| is a previous error status // an error condition. |create_session_status| is a previous error status
// returned by the CreateSession(). |license_response| points to a std::string to // returned by the CreateSession(). |license_response| points to a std::string to
@@ -87,6 +88,8 @@ class WvPLSDKEnvironment {
WvPLStatus SetDeviceCertificateStatusList(const std::string& cert_list) const; WvPLStatus SetDeviceCertificateStatusList(const std::string& cert_list) const;
static void SetConfigValue(const std::map<std::string, std::string>& config_values);
// Number of seconds until the certificate status list expires after its // Number of seconds until the certificate status list expires after its
// creation time. Default value is 604800 seconds. // creation time. Default value is 604800 seconds.
uint32_t device_certificate_expiration_seconds_ = 604800; uint32_t device_certificate_expiration_seconds_ = 604800;