Merge "Disable new unit tests for old oemcrypto" into oc-dev

am: 92dff24180

Change-Id: I26f0e27ef503199c679548fd08780e3ebf191a4b
This commit is contained in:
Fred Gylys-Colwell
2017-03-29 20:31:28 +00:00
committed by android-build-merger

View File

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