From 125856238c0b8365facc223fd1a150cf1c5cb0ca Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Wed, 17 Apr 2019 18:06:13 -0700 Subject: [PATCH] Rename WvGenericOperationsTest. (This is a merge of http://go/wvgerrit/76043) This renames the tests to be *GenericCrypto* to match the OEMCrypto tests and ensures these tests are skipped when the device doesn't support generic crypto. Test: Android Unit Tests Bug: 126392281 Change-Id: Ib16ca8c57ed5d99dde802d4d9a63eced0fa807a5 --- libwvdrmengine/cdm/core/include/cdm_engine.h | 2 +- .../cdm/core/test/generic_crypto_unittest.cpp | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/cdm_engine.h b/libwvdrmengine/cdm/core/include/cdm_engine.h index 05ed5bd0..e75fed2a 100644 --- a/libwvdrmengine/cdm/core/include/cdm_engine.h +++ b/libwvdrmengine/cdm/core/include/cdm_engine.h @@ -345,7 +345,7 @@ class CdmEngine { friend class ParallelCdmTest; friend class WvCdmEnginePreProvTest; friend class WvCdmTestBase; - friend class WvGenericOperationsTest; + friend class WvGenericCryptoTest; friend class TestLicenseHolder; CdmEngine(FileSystem* file_system, diff --git a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp index 0c882974..2a51ab9e 100644 --- a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp @@ -29,9 +29,9 @@ namespace wvcdm { -class WvGenericOperationsTest : public WvCdmTestBase { +class WvGenericCryptoTest : public WvCdmTestBase { public: - WvGenericOperationsTest() + WvGenericCryptoTest() : dummy_engine_metrics_(new metrics::EngineMetrics), cdm_engine_(&file_system_, dummy_engine_metrics_), holder_(&cdm_engine_) {} @@ -95,11 +95,11 @@ class WvGenericOperationsTest : public WvCdmTestBase { std::string iv_; }; -TEST_F(WvGenericOperationsTest, LoadSpecialKeys) { +TEST_F(WvGenericCryptoTest, LoadSpecialKeys) { holder_.SignAndLoadLicense(); } -TEST_F(WvGenericOperationsTest, GenericEncryptGood) { +TEST_F(WvGenericCryptoTest, GenericEncryptGood) { CdmResponseType cdm_sts; std::string encrypted = Aes128CbcEncrypt(ency_key_, in_vector_, iv_vector_); std::string out_buffer; @@ -113,7 +113,7 @@ TEST_F(WvGenericOperationsTest, GenericEncryptGood) { EXPECT_EQ(encrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericEncryptNoKey) { +TEST_F(WvGenericCryptoTest, GenericEncryptNoKey) { CdmResponseType cdm_sts; std::string encrypted = Aes128CbcEncrypt(ency_key_, in_vector_, iv_vector_); std::string out_buffer; @@ -127,7 +127,7 @@ TEST_F(WvGenericOperationsTest, GenericEncryptNoKey) { EXPECT_NE(encrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericEncryptKeyNotAllowed) { +TEST_F(WvGenericCryptoTest, GenericEncryptKeyNotAllowed) { CdmResponseType cdm_sts; // Trying to use Decrypt key to encrypt, which is not allowed. KeyId key_id = dency_id_; @@ -142,7 +142,7 @@ TEST_F(WvGenericOperationsTest, GenericEncryptKeyNotAllowed) { EXPECT_NE(encrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericDecryptGood) { +TEST_F(WvGenericCryptoTest, GenericDecryptGood) { CdmResponseType cdm_sts; std::string decrypted = Aes128CbcDecrypt(dency_key_, in_vector_, iv_vector_); std::string out_buffer; @@ -156,7 +156,7 @@ TEST_F(WvGenericOperationsTest, GenericDecryptGood) { EXPECT_EQ(decrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericDecryptNoKey) { +TEST_F(WvGenericCryptoTest, GenericDecryptNoKey) { CdmResponseType cdm_sts; std::string decrypted = Aes128CbcDecrypt(dency_key_, in_vector_, iv_vector_); std::string out_buffer; @@ -170,7 +170,7 @@ TEST_F(WvGenericOperationsTest, GenericDecryptNoKey) { EXPECT_NE(decrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericDecryptKeyNotAllowed) { +TEST_F(WvGenericCryptoTest, GenericDecryptKeyNotAllowed) { CdmResponseType cdm_sts; // Trying to use Encrypt key to decrypt, which is not allowed. KeyId key_id = ency_id_; @@ -185,7 +185,7 @@ TEST_F(WvGenericOperationsTest, GenericDecryptKeyNotAllowed) { EXPECT_NE(decrypted, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericSignKeyNotAllowed) { +TEST_F(WvGenericCryptoTest, GenericSignKeyNotAllowed) { CdmResponseType cdm_sts; // Wrong key std::string key_id = vou_id_; @@ -200,7 +200,7 @@ TEST_F(WvGenericOperationsTest, GenericSignKeyNotAllowed) { EXPECT_NE(signature, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericSignGood) { +TEST_F(WvGenericCryptoTest, GenericSignGood) { CdmResponseType cdm_sts; std::string out_buffer; std::string signature = SignHMAC(in_buffer_, siggy_key_); @@ -213,7 +213,7 @@ TEST_F(WvGenericOperationsTest, GenericSignGood) { EXPECT_EQ(signature, out_buffer); } -TEST_F(WvGenericOperationsTest, GenericVerifyKeyNotAllowed) { +TEST_F(WvGenericCryptoTest, GenericVerifyKeyNotAllowed) { CdmResponseType cdm_sts; // Wrong key std::string key_id = siggy_id_; @@ -226,7 +226,7 @@ TEST_F(WvGenericOperationsTest, GenericVerifyKeyNotAllowed) { EXPECT_EQ(UNKNOWN_ERROR, cdm_sts); } -TEST_F(WvGenericOperationsTest, GenericVerifyBadSignautre) { +TEST_F(WvGenericCryptoTest, GenericVerifyBadSignautre) { CdmResponseType cdm_sts; std::string signature(MAC_KEY_SIZE, 's'); @@ -238,7 +238,7 @@ TEST_F(WvGenericOperationsTest, GenericVerifyBadSignautre) { EXPECT_EQ(UNKNOWN_ERROR, cdm_sts); } -TEST_F(WvGenericOperationsTest, GenericVerifyGood) { +TEST_F(WvGenericCryptoTest, GenericVerifyGood) { CdmResponseType cdm_sts; std::string signature = SignHMAC(in_buffer_, vou_key_); @@ -249,7 +249,7 @@ TEST_F(WvGenericOperationsTest, GenericVerifyGood) { EXPECT_EQ(NO_ERROR, cdm_sts); } -TEST_F(WvGenericOperationsTest, GenericEncryptDecrypt) { +TEST_F(WvGenericCryptoTest, GenericEncryptDecrypt) { CdmResponseType cdm_sts; std::string out_buffer; std::string clear_buffer; @@ -276,7 +276,7 @@ TEST_F(WvGenericOperationsTest, GenericEncryptDecrypt) { EXPECT_EQ(in_buffer_, clear_buffer); } -TEST_F(WvGenericOperationsTest, GenericSignVerify) { +TEST_F(WvGenericCryptoTest, GenericSignVerify) { CdmResponseType cdm_sts; std::string signature_buffer;