diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index 0d617d01..ef5c364a 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -1413,7 +1413,7 @@ class OEMCryptoMemoryLicenseTest : public OEMCryptoLicenseTestAPI16 { EntitledMessage entitled_message_; size_t entitlement_response_length_; - void TestLoadEntitlementKeysForHugeBufferLengths( + void TestLoadEntitledKeysForHugeBufferLengths( const std::function f, bool check_status) { size_t entitled_key_data_size = entitled_message_.entitled_key_data_size(); @@ -1679,7 +1679,7 @@ TEST_P(OEMCryptoLicenseTest, LoadKeyWithNonceTwiceAPI16) { } // This verifies that entitlement keys and entitled content keys can be loaded. -TEST_P(OEMCryptoLicenseTest, LoadEntitlementKeysAPI14) { +TEST_P(OEMCryptoLicenseTest, LoadEntitledKeysAPI14) { ASSERT_NO_FATAL_FAILURE(session_.GenerateNonce()); license_messages_.set_license_type(OEMCrypto_EntitlementLicense); ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest()); @@ -1696,7 +1696,7 @@ TEST_P(OEMCryptoLicenseTest, LoadEntitlementKeysAPI14) { // This verifies that entitled content keys cannot be loaded if we have not yet // loaded the entitlement keys. -TEST_P(OEMCryptoLicenseTest, LoadEntitlementKeysNoEntitlementKeysAPI14) { +TEST_P(OEMCryptoLicenseTest, LoadEntitledKeysNoEntitlementKeysAPI14) { ASSERT_NO_FATAL_FAILURE(session_.GenerateNonce()); license_messages_.set_license_type(OEMCrypto_EntitlementLicense); ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest()); @@ -1710,7 +1710,7 @@ TEST_P(OEMCryptoLicenseTest, LoadEntitlementKeysNoEntitlementKeysAPI14) { // This verifies that entitled content keys cannot be loaded if we have loaded // the wrong entitlement keys. -TEST_P(OEMCryptoLicenseTest, LoadEntitlementKeysWrongEntitlementKeysAPI14) { +TEST_P(OEMCryptoLicenseTest, LoadEntitledKeysWrongEntitlementKeysAPI14) { ASSERT_NO_FATAL_FAILURE(session_.GenerateNonce()); license_messages_.set_license_type(OEMCrypto_EntitlementLicense); ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest()); @@ -1757,8 +1757,8 @@ TEST_F(OEMCryptoMemoryLicenseTest, } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyIdLength) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyIdLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_id.length = key_id_length; @@ -1767,8 +1767,8 @@ TEST_F(OEMCryptoMemoryLicenseTest, } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyIdOffset) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyIdOffset) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_offset, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_id.offset = key_id_offset; @@ -1778,7 +1778,7 @@ TEST_F(OEMCryptoMemoryLicenseTest, TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyIdLength) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyIdLength) { auto& content_key_id = entitled_message_.entitled_key_array()[0].content_key_id; content_key_id.length = @@ -1788,7 +1788,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyIdOffset) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyIdOffset) { auto& content_key_id = entitled_message_.entitled_key_array()[0].content_key_id; content_key_id.offset = @@ -1796,10 +1796,9 @@ TEST_F( ASSERT_NE(OEMCrypto_SUCCESS, entitled_message_.LoadKeys()); } -TEST_F( - OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringEntitlementKeyIdLength) { - TestLoadEntitlementKeysForHugeBufferLengths( +TEST_F(OEMCryptoMemoryLicenseTest, + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringEntitlementKeyIdLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].entitlement_key_id.length = key_id_length; @@ -1807,10 +1806,9 @@ TEST_F( !kCheckStatus); } -TEST_F( - OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringEntitlementKeyIdOffset) { - TestLoadEntitlementKeysForHugeBufferLengths( +TEST_F(OEMCryptoMemoryLicenseTest, + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringEntitlementKeyIdOffset) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_offset, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].entitlement_key_id.offset = key_id_offset; @@ -1820,7 +1818,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringEntitlementKeyIdLength) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringEntitlementKeyIdLength) { auto& entitlement_key_id = entitled_message_.entitled_key_array()[0].entitlement_key_id; entitlement_key_id.length = @@ -1830,7 +1828,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringEntitlementKeyIdOffset) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringEntitlementKeyIdOffset) { auto& entitlement_key_id = entitled_message_.entitled_key_array()[0].entitlement_key_id; entitlement_key_id.offset = @@ -1838,10 +1836,9 @@ TEST_F( ASSERT_NE(OEMCrypto_SUCCESS, entitled_message_.LoadKeys()); } -TEST_F( - OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyDataIvLength) { - TestLoadEntitlementKeysForHugeBufferLengths( +TEST_F(OEMCryptoMemoryLicenseTest, + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyDataIvLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t content_key_data_iv_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_data_iv.length = content_key_data_iv_length; @@ -1849,10 +1846,9 @@ TEST_F( !kCheckStatus); } -TEST_F( - OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyDataIvOffset) { - TestLoadEntitlementKeysForHugeBufferLengths( +TEST_F(OEMCryptoMemoryLicenseTest, + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyDataIvOffset) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t content_key_data_iv_offset, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_data_iv.offset = content_key_data_iv_offset; @@ -1862,7 +1858,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyDataIvLength) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyDataIvLength) { auto& content_key_data_iv = entitled_message_.entitled_key_array()[0].content_key_data_iv; content_key_data_iv.length = @@ -1872,7 +1868,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyDataIvOffset) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyDataIvOffset) { auto& content_key_data_iv = entitled_message_.entitled_key_array()[0].content_key_data_iv; content_key_data_iv.offset = @@ -1881,8 +1877,8 @@ TEST_F( } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyDataLength) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyDataLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t content_key_data_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_data.length = content_key_data_length; @@ -1891,8 +1887,8 @@ TEST_F(OEMCryptoMemoryLicenseTest, } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeSubstringContentKeyDataOffset) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeSubstringContentKeyDataOffset) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t content_key_data_offset, EntitledMessage* entitled_message) { entitled_message->entitled_key_array()[0].content_key_data.offset = content_key_data_offset; @@ -1902,7 +1898,7 @@ TEST_F(OEMCryptoMemoryLicenseTest, TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyDataLength) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyDataLength) { auto& content_key_data = entitled_message_.entitled_key_array()[0].content_key_data; content_key_data.length = @@ -1912,7 +1908,7 @@ TEST_F( TEST_F( OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForOutOfRangeSubstringContentKeyDataOffset) { + OEMCryptoMemoryLoadEntitledKeysForOutOfRangeSubstringContentKeyDataOffset) { auto& content_key_data = entitled_message_.entitled_key_array()[0].content_key_data; content_key_data.offset = @@ -1921,8 +1917,8 @@ TEST_F( } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeEntitlementKeyIdLength) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeEntitlementKeyIdLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_data()->entitlement_key_id_length = key_id_length; @@ -1931,8 +1927,8 @@ TEST_F(OEMCryptoMemoryLicenseTest, } TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeContentKeyIdLength) { - TestLoadEntitlementKeysForHugeBufferLengths( + OEMCryptoMemoryLoadEntitledKeysForHugeContentKeyIdLength) { + TestLoadEntitledKeysForHugeBufferLengths( [](size_t key_id_length, EntitledMessage* entitled_message) { entitled_message->entitled_key_data()->content_key_id_length = key_id_length; @@ -1943,7 +1939,7 @@ TEST_F(OEMCryptoMemoryLicenseTest, // This verifies that entitled content keys API does not crash for unreasonable // input message buffer lengths. TEST_F(OEMCryptoMemoryLicenseTest, - OEMCryptoMemoryLoadEntitlementKeysForHugeBufferLength) { + OEMCryptoMemoryLoadEntitledKeysForHugeBufferLength) { auto oemcrypto_function = [&](size_t buffer_length) { size_t entitled_key_data_length = entitled_message_.entitled_key_data_size();