WvPL License SDK release: 16.5.0

This commit is contained in:
Buildbot
2021-11-04 23:18:08 +00:00
parent b5d6e495de
commit 4db51c1c61
249 changed files with 83584 additions and 329 deletions

View File

@@ -7,6 +7,7 @@
#include <memory>
#include <string>
#include "license_server_sdk/public/environment.h"
#include "sdk/external/common/wvpl/wvpl_sdk_environment.h"
#include "sdk/external/common/wvpl/wvpl_types.h"
@@ -15,6 +16,8 @@
namespace video_widevine_server {
namespace wv_pl_sdk {
using video_widevine::Environment;
class WvPLLicenseCounter;
class WvPLSession;
@@ -36,6 +39,7 @@ class WvPLSession;
// std::string service_cert;
// WVStatus status;
// status = wvpl_environment->Initialize();
// wvpl_environment->SetPreProvisioningKeys(prev_prov_keys);
// status = wvpl_environment->SetDrmServiceCertificate(
// "<Provider service cert>", "<Service Private Key>",
// "<Service Private Key Passphrase>");
@@ -53,6 +57,8 @@ class WvPLEnvironment : public WvPLSDKEnvironment {
virtual ~WvPLEnvironment();
// TODO(b/194740480): This function will be changed to private since end-Q3
// 2021 release.
// One time initialization. Must be called once after construction.
virtual WvPLStatus Initialize();
@@ -95,10 +101,13 @@ class WvPLEnvironment : public WvPLSDKEnvironment {
virtual WvPLStatus GetStatsAsBytes(bool flush_data,
std::string* signed_license_stats);
// Return the license counter data in a human-readable format. The internal
// data is flushed if |flush_data| is true. If |flush_data| is false,
// license counters will accumulate. If this call returns "Status::OK",
// |license_stats| is populated. |license_stats| is owned by the caller.
// TODO(b/193921143): flush_data parameter will be removed since end-Q3 2021
// release.
// Return the license counter data in a human-readable format. The
// internal data is flushed if |flush_data| is true. If |flush_data| is
// false, license counters will accumulate. If this call returns
// "Status::OK", |license_stats| is populated. |license_stats| is owned by
// the caller.
virtual WvPLStatus GetStatsAsString(bool flush_data,
std::string* license_stats);
@@ -120,9 +129,11 @@ class WvPLEnvironment : public WvPLSDKEnvironment {
// Generate a signed request to be sent to Widevine Certificate Provisioning
// Server to retrieve 'DeviceCertificateStatusList'.
virtual WvPLStatus GenerateDeviceStatusListRequest(
std::string* signed_device_certificate_status_list_request);
WvPLStatus GenerateDeviceStatusListRequest(
std::string* signed_device_certificate_status_list_request) override;
// TODO(b/193920802): This function will be changed to private function in
// mid-2021 Q3 release.
// Get the expected service type for drm service certificate. The expected
// value is LICENSE_SERVER_SDK.
int GetExpectedServiceCertificateType() override;
@@ -154,6 +165,9 @@ class WvPLEnvironment : public WvPLSDKEnvironment {
// send a v17 message by setting the std::string to "16". For details, please see
// common/oemcrypto_core_message/odk/include/core_message_features.h
std::string core_message_features_;
// A few functions from license_server_sdk/public/environment are used to run
// wvpl_environment.
std::unique_ptr<Environment> environment_;
};
} // namespace wv_pl_sdk

View File

@@ -29,8 +29,8 @@ class WvPLLicenseCounter;
// major version to line up with latest released OEMCryptoAPI version.
const uint32_t kMajorVersion = 16;
const uint32_t kMinorVersion = 4;
const uint32_t kRelease = 5;
const uint32_t kMinorVersion = 5;
const uint32_t kRelease = 0;
// Once a Widevine environment object is successfully initialized, generate a
// Widevine session object for each license request. CreateSession() parses
@@ -67,9 +67,10 @@ class WvPLSession : public WvPLSDKSession {
// <major_version>.<minor_version>.<release>
static std::string GetVersionString();
// TODO(b/193921795): this API will be deprecated since end-Q3 2021 release.
// Please use GetDeviceInfo() instead.
// Returns true if a provisioned device info exists. Populates the specified
// |device_info| structure.
// TODO(hali): Deprecate this API and use GetDeviceInfo() instead.
virtual bool GetProvisionedDeviceInfo(WvPLDeviceInfo* device_info) const;
// Populates the specified |device_info| structure. This API works only for