From 17da2fbfdd1571cfd5770d93bc1c400a6dc33903 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Tue, 28 Mar 2017 13:29:01 -0700
Subject: [PATCH] Disable new unit tests for old oemcrypto

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
---
 libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 7e13ab7e..d3b40f6e 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -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;