diff --git a/whitebox/api/license_whitebox_entitlement_content_key_test.cc b/whitebox/api/license_whitebox_entitlement_content_key_test.cc index bf8e108..aedd838 100644 --- a/whitebox/api/license_whitebox_entitlement_content_key_test.cc +++ b/whitebox/api/license_whitebox_entitlement_content_key_test.cc @@ -64,18 +64,12 @@ TEST_P(LicenseWhiteboxEntitlementContentKeyTest, Decrypt) { std::vector decrypted(content.plaintext.size()); size_t decrypted_size = decrypted.size(); - ASSERT_EQ(WB_License_Decrypt( - whitebox_, - WB_CIPHER_MODE_CTR, - key_id.data(), - key_id.size(), - content.ciphertext.data(), - content.ciphertext.size(), - content.iv.data(), - content.iv.size(), - &decrypted[0], - &decrypted_size), - WB_RESULT_OK); + ASSERT_EQ( + WB_License_Decrypt(whitebox_, WB_CIPHER_MODE_CTR, key_id.data(), + key_id.size(), content.ciphertext.data(), + content.ciphertext.size(), content.iv.data(), + content.iv.size(), &decrypted[0], &decrypted_size), + WB_RESULT_OK); decrypted.resize(decrypted_size); EXPECT_EQ(decrypted, content.plaintext); } @@ -113,22 +107,15 @@ TEST_F(LicenseWhiteboxEntitlementContentKeyTest, Remove) { std::vector decrypted(content.plaintext.size()); size_t decrypted_size = decrypted.size(); - ASSERT_EQ(WB_License_Decrypt( - whitebox_, - WB_CIPHER_MODE_CTR, - key_id.data(), - key_id.size(), - content.ciphertext.data(), - content.ciphertext.size(), - content.iv.data(), - content.iv.size(), - &decrypted[0], - &decrypted_size), - WB_RESULT_KEY_UNAVAILABLE); + ASSERT_EQ( + WB_License_Decrypt(whitebox_, WB_CIPHER_MODE_CTR, key_id.data(), + key_id.size(), content.ciphertext.data(), + content.ciphertext.size(), content.iv.data(), + content.iv.size(), &decrypted[0], &decrypted_size), + WB_RESULT_KEY_UNAVAILABLE); } -INSTANTIATE_TEST_SUITE_P( - WithAndWithoutProviderKeyId, - LicenseWhiteboxEntitlementContentKeyTest, - ::testing::Values(kNoProviderKeyId, kProviderKeyId)); +INSTANTIATE_TEST_SUITE_P(WithAndWithoutProviderKeyId, + LicenseWhiteboxEntitlementContentKeyTest, + ::testing::Values(kNoProviderKeyId, kProviderKeyId)); } // namespace widevine diff --git a/whitebox/api/license_whitebox_generic_crypto_test.cc b/whitebox/api/license_whitebox_generic_crypto_test.cc index 528e006..80e8fac 100644 --- a/whitebox/api/license_whitebox_generic_crypto_test.cc +++ b/whitebox/api/license_whitebox_generic_crypto_test.cc @@ -14,7 +14,8 @@ namespace widevine { class LicenseWhiteboxGenericCryptoInvalidTest - : public LicenseWhiteboxTestBase, public testing::WithParamInterface { + : public LicenseWhiteboxTestBase, + public testing::WithParamInterface { protected: void SetUp() { LicenseWhiteboxTestBase::SetUp(); @@ -81,11 +82,13 @@ TEST_P(LicenseWhiteboxGenericCryptoInvalidTest, Test) { WB_RESULT_KEY_UNAVAILABLE); } -INSTANTIATE_TEST_SUITE_P(All, LicenseWhiteboxGenericCryptoInvalidTest, +INSTANTIATE_TEST_SUITE_P(All, + LicenseWhiteboxGenericCryptoInvalidTest, testing::Range(0, 6)); class LicenseWhiteboxGenericCryptoTest - : public LicenseWhiteboxTestBase, public testing::WithParamInterface { + : public LicenseWhiteboxTestBase, + public testing::WithParamInterface { protected: void SetUp() { LicenseWhiteboxTestBase::SetUp(); @@ -129,10 +132,10 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, NoContentDecrypt) { GetParam() ? content.encrypt_decrypt_key.id : content.decrypt_key.id; std::vector actual(content.plaintext.size()); size_t actual_size = actual.size(); - result = WB_License_Decrypt( - whitebox_, WB_CIPHER_MODE_CTR, key_id.data(), key_id.size(), - content.encrypted.data(), content.encrypted.size(), content.iv.data(), - content.iv.size(), actual.data(), &actual_size); + result = WB_License_Decrypt(whitebox_, WB_CIPHER_MODE_CTR, key_id.data(), + key_id.size(), content.encrypted.data(), + content.encrypted.size(), content.iv.data(), + content.iv.size(), actual.data(), &actual_size); #ifndef HAS_GENERIC_CRYPTO if (result == WB_RESULT_NOT_IMPLEMENTED) GTEST_SKIP(); @@ -229,8 +232,8 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, DecryptShortBuffer) { size_t actual_size = 0; result = WB_License_GenericDecrypt( whitebox_, key_id.data(), key_id.size(), content.encrypted.data(), - content.encrypted.size(), content.iv.data(), content.iv.size(), - nullptr, &actual_size); + content.encrypted.size(), content.iv.data(), content.iv.size(), nullptr, + &actual_size); #ifndef HAS_GENERIC_CRYPTO if (result == WB_RESULT_NOT_IMPLEMENTED) GTEST_SKIP(); @@ -284,8 +287,7 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, DecryptKeyUsage) { ASSERT_EQ(result, WB_RESULT_OK); auto& content = golden_data_.GenericContent(); - auto& key_id = - GetParam() ? content.sign_verify_key.id : content.sign_key.id; + auto& key_id = GetParam() ? content.sign_verify_key.id : content.sign_key.id; std::vector actual(content.plaintext.size()); size_t actual_size = actual.size(); result = WB_License_GenericDecrypt( @@ -384,8 +386,8 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, EncryptShortBuffer) { size_t actual_size = 0; result = WB_License_GenericEncrypt( whitebox_, key_id.data(), key_id.size(), content.plaintext.data(), - content.plaintext.size(), content.iv.data(), content.iv.size(), - nullptr, &actual_size); + content.plaintext.size(), content.iv.data(), content.iv.size(), nullptr, + &actual_size); #ifndef HAS_GENERIC_CRYPTO if (result == WB_RESULT_NOT_IMPLEMENTED) GTEST_SKIP(); @@ -439,8 +441,7 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, EncryptKeyUsage) { ASSERT_EQ(result, WB_RESULT_OK); auto& content = golden_data_.GenericContent(); - auto& key_id = - GetParam() ? content.sign_verify_key.id : content.sign_key.id; + auto& key_id = GetParam() ? content.sign_verify_key.id : content.sign_key.id; std::vector actual(content.encrypted.size()); size_t actual_size = actual.size(); result = WB_License_GenericEncrypt( @@ -500,8 +501,7 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, Sign) { ASSERT_EQ(result, WB_RESULT_OK); auto& content = golden_data_.GenericContent(); - auto& key_id = - GetParam() ? content.sign_verify_key.id : content.sign_key.id; + auto& key_id = GetParam() ? content.sign_verify_key.id : content.sign_key.id; std::vector actual(content.signature.size()); size_t actual_size = actual.size(); result = WB_License_GenericSign( @@ -533,8 +533,7 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, SignShortBuffer) { ASSERT_EQ(result, WB_RESULT_OK); auto& content = golden_data_.GenericContent(); - auto& key_id = - GetParam() ? content.sign_verify_key.id : content.sign_key.id; + auto& key_id = GetParam() ? content.sign_verify_key.id : content.sign_key.id; size_t actual_size = 0; result = WB_License_GenericSign( whitebox_, key_id.data(), key_id.size(), content.plaintext.data(), @@ -562,8 +561,7 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, SignMissingKey) { ASSERT_EQ(result, WB_RESULT_OK); auto& content = golden_data_.GenericContent(); - auto& key_id = - !GetParam() ? content.sign_verify_key.id : content.sign_key.id; + auto& key_id = !GetParam() ? content.sign_verify_key.id : content.sign_key.id; std::vector actual(content.signature.size()); size_t actual_size = actual.size(); result = WB_License_GenericSign( @@ -693,7 +691,8 @@ TEST_P(LicenseWhiteboxGenericCryptoTest, VerifyKeyUsage) { ASSERT_EQ(result, WB_RESULT_INSUFFICIENT_PERMISSIONS); } -INSTANTIATE_TEST_SUITE_P(All, LicenseWhiteboxGenericCryptoTest, +INSTANTIATE_TEST_SUITE_P(All, + LicenseWhiteboxGenericCryptoTest, testing::Bool()); } // namespace widevine diff --git a/whitebox/api/license_whitebox_key_control_block_test.cc b/whitebox/api/license_whitebox_key_control_block_test.cc index b89885c..8a88894 100644 --- a/whitebox/api/license_whitebox_key_control_block_test.cc +++ b/whitebox/api/license_whitebox_key_control_block_test.cc @@ -119,7 +119,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Bool())); class LicenseWhiteboxKeyControlBlockSingleTest - : public LicenseWhiteboxTestBase { + : public LicenseWhiteboxTestBase { protected: void SetUp() override { LicenseWhiteboxTestBase::SetUp(); diff --git a/whitebox/api/license_whitebox_process_license_response_test.cc b/whitebox/api/license_whitebox_process_license_response_test.cc index 8cc15f4..b253e40 100644 --- a/whitebox/api/license_whitebox_process_license_response_test.cc +++ b/whitebox/api/license_whitebox_process_license_response_test.cc @@ -100,8 +100,7 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseTest, WB_RESULT_OK); } -TEST_F(LicenseWhiteboxProcessLicenseResponseTest, - SuccessWithEntitlementKey) { +TEST_F(LicenseWhiteboxProcessLicenseResponseTest, SuccessWithEntitlementKey) { UseLicenseWithEntitlementKey(); const auto result = WB_License_ProcessLicenseResponse( diff --git a/whitebox/api/remote_attestation_and_verification_test.cc b/whitebox/api/remote_attestation_and_verification_test.cc index 5392367..a4bbe41 100644 --- a/whitebox/api/remote_attestation_and_verification_test.cc +++ b/whitebox/api/remote_attestation_and_verification_test.cc @@ -137,7 +137,8 @@ class RemoteAttestationAndVerificationTest #ifdef ALWAYS_DECRYPT_TO_CLEAR if (key == Key::kDecode) { - if (mode_ == Mode::kDecryptFail) mode_ = Mode::kDecryptPass; + if (mode_ == Mode::kDecryptFail) + mode_ = Mode::kDecryptPass; } #endif diff --git a/whitebox/reference/impl/license_whitebox_impl.cc b/whitebox/reference/impl/license_whitebox_impl.cc index e6e461e..e37b6c2 100644 --- a/whitebox/reference/impl/license_whitebox_impl.cc +++ b/whitebox/reference/impl/license_whitebox_impl.cc @@ -593,15 +593,14 @@ WB_Result WB_License_RemoveEntitledContentKey(WB_License_Whitebox* whitebox, return WB_RESULT_INVALID_STATE; } - if (whitebox->content_keys.erase(MakeString(content_key_id, - content_key_id_size)) == 0) { + if (whitebox->content_keys.erase( + MakeString(content_key_id, content_key_id_size)) == 0) { DVLOG(1) << "Content key not found."; return WB_RESULT_KEY_UNAVAILABLE; } return WB_RESULT_OK; } - WB_Result WB_License_QueryKeyStatus(const WB_License_Whitebox* whitebox, WB_KeyQueryType type, const uint8_t* key_id, @@ -1052,9 +1051,9 @@ WB_Result WB_License_GenericVerify(const WB_License_Whitebox* whitebox, } if (!widevine::crypto_util::VerifySignatureHmacSha256( - MakeString(it->second.key.data(), it->second.key.size()), - MakeString(signature, signature_size), - MakeString(message, message_size))) { + MakeString(it->second.key.data(), it->second.key.size()), + MakeString(signature, signature_size), + MakeString(message, message_size))) { return WB_RESULT_INVALID_SIGNATURE; } return WB_RESULT_OK;