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

Remove asserts from GenerateSimpleSampleDescription()

Browse Source 
(This change is merged from http://go/wvgerrit/124824)

GenerateSimpleSampleDescription() only had asserts to check parameters
that only came from other test code, so they weren't testing anything of
use. With the asserts removed, it's no longer necessary to wrap calls to
GenerateSimpleSampleDescription() with ASSERT_NO_FATAL_FAILURE(), which
a lot of callers were already forgetting to do anyway. This also
simplifies a future patch that will generalize the decryption test code
to work with entitlement licenses.

Bug: 186782279
Test: x86-64 platform
Test: build_and_run_all_unit_tests
Change-Id: I987427fdfee4826d77ab95344f9aca8c374b2001
This commit is contained in:
John W. Bruce
2021-05-11 12:49:22 -07:00
parent ddaae9a17b
commit ed17d09c1b
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/oemcrypto/test/oec_session_util.cpp
View File

@@ -70,9 +70,6 @@ void GenerateSimpleSampleDescription(
const std::vector<uint8_t>& in, std::vector<uint8_t>& out, const std::vector<uint8_t>& in, std::vector<uint8_t>& out,
OEMCrypto_SampleDescription* sample, OEMCrypto_SampleDescription* sample,
OEMCrypto_SubSampleDescription* subsample) { OEMCrypto_SubSampleDescription* subsample) {
ASSERT_NE(sample, nullptr);
ASSERT_NE(subsample, nullptr);
// Generate test data // Generate test data
EXPECT_EQ(GetRandBytes(&sample->iv[0], KEY_IV_SIZE), 1); EXPECT_EQ(GetRandBytes(&sample->iv[0], KEY_IV_SIZE), 1);
@@ -1338,9 +1335,8 @@ void Session::TestDecryptCTR(bool select_key_first,
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(encrypted_data, output_buffer,
encrypted_data, output_buffer, &sample_description, &sample_description, &subsample_description);
&subsample_description));
// Generate test data // Generate test data
EXPECT_EQ(GetRandBytes(unencrypted_data.data(), unencrypted_data.size()), 1); EXPECT_EQ(GetRandBytes(unencrypted_data.data(), unencrypted_data.size()), 1);

20
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -2516,8 +2516,8 @@ TEST_P(OEMCryptoLicenseTest, SelectKeyNotThereAPI16) {
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
in_buffer, out_buffer, &sample_description, &subsample_description)); &subsample_description);
// Generate test data // Generate test data
for (size_t i = 0; i < in_buffer.size(); i++) in_buffer[i] = i % 256; for (size_t i = 0; i < in_buffer.size(); i++) in_buffer[i] = i % 256;
@@ -2551,8 +2551,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCensAPI16) {
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
in_buffer, out_buffer, &sample_description, &subsample_description)); &subsample_description);
// Create a non-zero pattern to indicate this is 'cens' // Create a non-zero pattern to indicate this is 'cens'
OEMCrypto_CENCEncryptPatternDesc pattern = {1, 9}; OEMCrypto_CENCEncryptPatternDesc pattern = {1, 9};
@@ -2582,8 +2582,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCbc1API16) {
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
in_buffer, out_buffer, &sample_description, &subsample_description)); &subsample_description);
// Create a zero pattern to indicate this is 'cbc1' // Create a zero pattern to indicate this is 'cbc1'
OEMCrypto_CENCEncryptPatternDesc pattern = {0, 0}; OEMCrypto_CENCEncryptPatternDesc pattern = {0, 0};
@@ -2612,8 +2612,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCbcsWithBlockOffset) {
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
in_buffer, out_buffer, &sample_description, &subsample_description)); &subsample_description);
subsample_description.block_offset = 5; // Any value 1-15 will do. subsample_description.block_offset = 5; // Any value 1-15 will do.
// Create a non-zero pattern to indicate this is 'cbcs'. // Create a non-zero pattern to indicate this is 'cbcs'.
@@ -2643,8 +2643,8 @@ TEST_P(OEMCryptoLicenseTest, RejectOversizedBlockOffset) {
OEMCrypto_SampleDescription sample_description; OEMCrypto_SampleDescription sample_description;
OEMCrypto_SubSampleDescription subsample_description; OEMCrypto_SubSampleDescription subsample_description;
ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription( GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
in_buffer, out_buffer, &sample_description, &subsample_description)); &subsample_description);
subsample_description.block_offset = 0xFF; // Anything 16+ subsample_description.block_offset = 0xFF; // Anything 16+
// Create a zero pattern to indicate this is 'cenc'. // Create a zero pattern to indicate this is 'cenc'.