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

Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 8b05bc3ed5 am: 0aba05ea26

Browse Source 
Change-Id: Id65a33e14923f13ff95b700fe7f7d2b7515da084
This commit is contained in:
TreeHugger Robot
2020-04-28 18:33:59 +00:00
committed by Automerger Merge Worker
parent 3c8acc3d56 0aba05ea26
commit 0a32a51738
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1865,7 +1865,7 @@ TEST_P(OEMCryptoRefreshTest, RefreshLargeBuffer) {
LoadLicense(); LoadLicense();
RenewalRoundTrip renewal_messages(&license_messages_); RenewalRoundTrip renewal_messages(&license_messages_);
const size_t max_size = GetResourceValue(kLargeMessageSize); const size_t max_size = GetResourceValue(kLargeMessageSize);
license_messages_.set_message_size(max_size); renewal_messages.set_message_size(max_size);
MakeRenewalRequest(&renewal_messages); MakeRenewalRequest(&renewal_messages);
LoadRenewal(&renewal_messages, OEMCrypto_SUCCESS); LoadRenewal(&renewal_messages, OEMCrypto_SUCCESS);
} }
@@ -4201,6 +4201,11 @@ class OEMCryptoGenericCryptoTest : public OEMCryptoRefreshTest {
} }
} }
void ResizeBuffer(size_t new_size) {
buffer_size_ = new_size;
InitializeClearBuffer(); // Re-initialize the clear buffer.
}
void EncryptAndLoadKeys() { void EncryptAndLoadKeys() {
ASSERT_NO_FATAL_FAILURE(license_messages_.EncryptAndSignResponse()); ASSERT_NO_FATAL_FAILURE(license_messages_.EncryptAndSignResponse());
ASSERT_EQ(OEMCrypto_SUCCESS, license_messages_.LoadResponse()); ASSERT_EQ(OEMCrypto_SUCCESS, license_messages_.LoadResponse());
@@ -4536,7 +4541,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyBadVerify) {
// Test Generic_Encrypt with the maximum buffer size. // Test Generic_Encrypt with the maximum buffer size.
TEST_P(OEMCryptoGenericCryptoTest, GenericKeyEncryptLargeBuffer) { TEST_P(OEMCryptoGenericCryptoTest, GenericKeyEncryptLargeBuffer) {
buffer_size_ = GetResourceValue(kMaxGenericBuffer); ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 0; unsigned int key_index = 0;
vector<uint8_t> expected_encrypted; vector<uint8_t> expected_encrypted;
@@ -4559,7 +4564,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyEncryptLargeBuffer) {
// Test Generic_Decrypt with the maximum buffer size. // Test Generic_Decrypt with the maximum buffer size.
TEST_P(OEMCryptoGenericCryptoTest, GenericKeyDecryptLargeBuffer) { TEST_P(OEMCryptoGenericCryptoTest, GenericKeyDecryptLargeBuffer) {
// Some applications are known to pass in a block that is almost 400k. // Some applications are known to pass in a block that is almost 400k.
buffer_size_ = GetResourceValue(kMaxGenericBuffer); ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 1; unsigned int key_index = 1;
vector<uint8_t> encrypted; vector<uint8_t> encrypted;
@@ -4580,7 +4585,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyDecryptLargeBuffer) {
// Test Generic_Sign with the maximum buffer size. // Test Generic_Sign with the maximum buffer size.
TEST_P(OEMCryptoGenericCryptoTest, GenericKeySignLargeBuffer) { TEST_P(OEMCryptoGenericCryptoTest, GenericKeySignLargeBuffer) {
buffer_size_ = GetResourceValue(kMaxGenericBuffer); ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 2; unsigned int key_index = 2;
vector<uint8_t> expected_signature; vector<uint8_t> expected_signature;
@@ -4608,7 +4613,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeySignLargeBuffer) {
// Test Generic_Verify with the maximum buffer size. // Test Generic_Verify with the maximum buffer size.
TEST_P(OEMCryptoGenericCryptoTest, GenericKeyVerifyLargeBuffer) { TEST_P(OEMCryptoGenericCryptoTest, GenericKeyVerifyLargeBuffer) {
buffer_size_ = GetResourceValue(kMaxGenericBuffer); ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 3; unsigned int key_index = 3;
vector<uint8_t> signature; vector<uint8_t> signature;