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

Disable new unit tests for old oemcrypto

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/24863

The oemcrypto unit tests GenericKeyDecryptSameBuffer and
GenericKeyDecryptSameBuffer require features in oemcrypto v12, so they
should not be run on devices that report oemcrypto v11 or earlier.

b/36071236

Test: Unit tests run on Ryu and Bullhead.
Change-Id: Ia6645559ed98cae8d9807a14d6f0e514c5c4c615
This commit is contained in:
Fred Gylys-Colwell
2017-03-28 13:29:01 -07:00
parent bfe6046199
commit 17da2fbfdd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3940,7 +3940,7 @@ TEST_F(GenericCryptoTest, GenericKeyBadEncrypt) {
BadEncrypt(3, OEMCrypto_AES_CBC_128_NO_PADDING, buffer_size_); BadEncrypt(3, OEMCrypto_AES_CBC_128_NO_PADDING, buffer_size_);
} }
TEST_F(GenericCryptoTest, GenericKeyEncryptSameBuffer) { TEST_F(GenericCryptoTest, GenericKeyEncryptSameBufferAPI12) {
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 0; unsigned int key_index = 0;
vector<uint8_t> expected_encrypted; vector<uint8_t> expected_encrypted;
@@ -3977,7 +3977,7 @@ TEST_F(GenericCryptoTest, GenericKeyDecrypt) {
ASSERT_EQ(clear_buffer_, resultant); ASSERT_EQ(clear_buffer_, resultant);
} }
TEST_F(GenericCryptoTest, GenericKeyDecryptSameBuffer) { TEST_F(GenericCryptoTest, GenericKeyDecryptSameBufferAPI12) {
EncryptAndLoadKeys(); EncryptAndLoadKeys();
unsigned int key_index = 1; unsigned int key_index = 1;
vector<uint8_t> encrypted; vector<uint8_t> encrypted;