Update Simulcrypt ECMg
This commit is contained in:
@@ -8,6 +8,10 @@
|
||||
|
||||
#include "common/content_id_util.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "testing/gmock.h"
|
||||
#include "testing/gunit.h"
|
||||
#include "protos/public/errors.pb.h"
|
||||
@@ -23,9 +27,9 @@ const char kPlayReadyChallenge[] = "<TestPRChallenge></TestPRChallenge>";
|
||||
namespace widevine {
|
||||
|
||||
// Builds a SignedMessage that includes an ExternalLicenseRequest.
|
||||
SignedMessage BuildSignedExternalLicenseRequest(
|
||||
const ExternalLicenseRequest::RequestType type, const std::string& request,
|
||||
const std::string& content_id) {
|
||||
SignedMessage BuildSignedExternalLicenseRequest(const ExternalLicenseType type,
|
||||
const std::string& request,
|
||||
const std::string& content_id) {
|
||||
ExternalLicenseRequest external_license_request;
|
||||
external_license_request.set_request_type(type);
|
||||
external_license_request.set_request(request);
|
||||
@@ -47,9 +51,8 @@ SignedMessage BuildSignedExternalLicenseRequest(
|
||||
TEST(ContentIdUtil, GetContentId) {
|
||||
std::string content_id;
|
||||
EXPECT_OK(GetContentIdFromSignedExternalLicenseRequest(
|
||||
BuildSignedExternalLicenseRequest(
|
||||
ExternalLicenseRequest::PLAYREADY_LICENSE_REQUEST,
|
||||
kPlayReadyChallenge, kContentId),
|
||||
BuildSignedExternalLicenseRequest(PLAYREADY_LICENSE_NEW,
|
||||
kPlayReadyChallenge, kContentId),
|
||||
&content_id));
|
||||
EXPECT_EQ(kContentId, content_id);
|
||||
}
|
||||
@@ -57,8 +60,7 @@ TEST(ContentIdUtil, GetContentId) {
|
||||
TEST(ContentIdUtil, GetContentIdFailureWithIncorrectType) {
|
||||
std::string content_id;
|
||||
SignedMessage signed_message = BuildSignedExternalLicenseRequest(
|
||||
ExternalLicenseRequest::PLAYREADY_LICENSE_REQUEST, kPlayReadyChallenge,
|
||||
kContentId);
|
||||
PLAYREADY_LICENSE_NEW, kPlayReadyChallenge, kContentId);
|
||||
signed_message.set_type(SignedMessage::SERVICE_CERTIFICATE_REQUEST);
|
||||
Status status =
|
||||
GetContentIdFromSignedExternalLicenseRequest(signed_message, &content_id);
|
||||
@@ -69,8 +71,7 @@ TEST(ContentIdUtil, GetContentIdFailureWithIncorrectType) {
|
||||
TEST(ContentIdUtil, GetContentIdFailureWithInvalidExternalLicenseRequest) {
|
||||
std::string content_id;
|
||||
SignedMessage signed_message = BuildSignedExternalLicenseRequest(
|
||||
ExternalLicenseRequest::PLAYREADY_LICENSE_REQUEST, kPlayReadyChallenge,
|
||||
kContentId);
|
||||
PLAYREADY_LICENSE_NEW, kPlayReadyChallenge, kContentId);
|
||||
signed_message.set_msg("Invalid payload");
|
||||
Status status =
|
||||
GetContentIdFromSignedExternalLicenseRequest(signed_message, &content_id);
|
||||
|
||||
Reference in New Issue
Block a user