Code Drop Three (Update Two)
In this update we have:
- Added the verified platform tests. These tests show how some
platforms, when verified are allowed to by pass the normal policy
restrictions. This is done with ChromeOS, thus the name of the
tests use "chrome_os".
- Removed WB_RESULT_INVALID_PADDING. This error was when we the
non-license APIs exposed a AES function with padding. However,
those functions have been removed from the API and this error is
no longer used by the API.
- Tests have been updated to avoid signed-vs-unsigned comparison
and to use the Chromium path to gTest (which is mocked in this
library).
- Tests have been updated to use a new test base and golden data
system to make them easier to read.
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "api/license_builder.h"
|
||||
#include "api/license_whitebox_test_base.h"
|
||||
#include "api/test_data.h"
|
||||
#include "api/test_license_builder.h"
|
||||
#include "crypto_utils/crypto_util.h"
|
||||
#include "crypto_utils/rsa_key.h"
|
||||
#include "testing/include/gtest/gtest.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
namespace widevine {
|
||||
|
||||
@@ -24,12 +24,12 @@ class LicenseWhiteboxVerifyRenewalResponseTest
|
||||
}
|
||||
|
||||
void LoadLicense(const std::vector<uint8_t>& padding) {
|
||||
const auto signing_key = LicenseBuilder::DefaultSigningKey();
|
||||
const auto signing_key = TestLicenseBuilder::DefaultSigningKey();
|
||||
|
||||
// We need a license so that we can always have a valid signature for our
|
||||
// message(s), but don't load the license as some test will need no
|
||||
// license loaded.
|
||||
LicenseBuilder builder;
|
||||
TestLicenseBuilder builder;
|
||||
builder.AddSigningKey(signing_key, padding);
|
||||
builder.AddStubbedContentKey();
|
||||
|
||||
@@ -45,7 +45,7 @@ class LicenseWhiteboxVerifyRenewalResponseTest
|
||||
}
|
||||
|
||||
std::vector<uint8_t> Sign(const std::vector<uint8_t>& message) {
|
||||
const auto key = LicenseBuilder::DefaultSigningKey();
|
||||
const auto key = TestLicenseBuilder::DefaultSigningKey();
|
||||
|
||||
// The server signing key is the first half of the signing key.
|
||||
std::string server_key = std::string(
|
||||
@@ -83,7 +83,7 @@ class LicenseWhiteboxVerifyRenewalResponseTest
|
||||
// SuccessForGarbageMessage - to use the real serialized response.
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest, SuccessForGarbageMessage) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(whitebox_,
|
||||
garbage_renewal_message_.data(),
|
||||
@@ -95,7 +95,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest, SuccessForGarbageMessage) {
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
SuccessWithSigningKeyPKSC8Padding) {
|
||||
LoadLicense(LicenseBuilder::PKSC8Padding());
|
||||
LoadLicense(TestLicenseBuilder::PKSC8Padding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(whitebox_,
|
||||
garbage_renewal_message_.data(),
|
||||
@@ -107,7 +107,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidParameterForNullWhitebox) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(
|
||||
WB_License_VerifyRenewalResponse(nullptr, garbage_renewal_message_.data(),
|
||||
@@ -119,7 +119,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidParameterForNullMessage) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(whitebox_, nullptr,
|
||||
garbage_renewal_message_.size(),
|
||||
@@ -130,7 +130,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidParameterForZeroMessageSize) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(whitebox_,
|
||||
garbage_renewal_message_.data(), 0,
|
||||
@@ -141,7 +141,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidParameterForNullSignature) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(
|
||||
whitebox_, garbage_renewal_message_.data(),
|
||||
@@ -152,7 +152,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidParameterForInvalidSignatureSize) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
ASSERT_EQ(WB_License_VerifyRenewalResponse(
|
||||
whitebox_, garbage_renewal_message_.data(),
|
||||
@@ -163,7 +163,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidSignatureForModifiedMessage) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
Modify(&garbage_renewal_message_);
|
||||
|
||||
@@ -177,7 +177,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest,
|
||||
InvalidSignatureForModifiedSignature) {
|
||||
LoadLicense(LicenseBuilder::NoPadding());
|
||||
LoadLicense(TestLicenseBuilder::NoPadding());
|
||||
|
||||
Modify(&garbage_renewal_signature_);
|
||||
|
||||
@@ -204,7 +204,7 @@ TEST_F(LicenseWhiteboxVerifyRenewalResponseTest, InvalidStateForNoLicense) {
|
||||
TEST_F(LicenseWhiteboxVerifyRenewalResponseTest, InvalidStateForNoSigningKey) {
|
||||
// Create a license with no signing key and one content key (every license
|
||||
// must have a content key).
|
||||
widevine::LicenseBuilder builder;
|
||||
widevine::TestLicenseBuilder builder;
|
||||
builder.AddStubbedContentKey();
|
||||
|
||||
License license;
|
||||
|
||||
Reference in New Issue
Block a user