From 6a1f050ffc78c4dcd27663283671a1927d43cd2f Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Wed, 21 Oct 2020 12:05:05 -0700 Subject: [PATCH] Update Widevine Copyright header for core CDM [ Merge of http://go/wvgerrit/108064 ] The Widevine License Agreement has been renamed to use inclusive language. This covers files in the core directory. Bug: 168562298 Test: verified compilation (comment only change) Change-Id: I8ae5a10cbfdf7faae6a2735e57b33729763f10b8 --- libwvdrmengine/cdm/core/include/buffer_reader.h | 4 ++-- libwvdrmengine/cdm/core/include/cdm_client_property_set.h | 4 ++-- libwvdrmengine/cdm/core/include/cdm_engine.h | 4 ++-- libwvdrmengine/cdm/core/include/cdm_engine_factory.h | 4 ++-- .../cdm/core/include/cdm_engine_metrics_decorator.h | 4 ++-- libwvdrmengine/cdm/core/include/cdm_session.h | 4 ++-- libwvdrmengine/cdm/core/include/cdm_session_map.h | 4 ++-- libwvdrmengine/cdm/core/include/certificate_provisioning.h | 4 ++-- libwvdrmengine/cdm/core/include/client_identification.h | 4 ++-- libwvdrmengine/cdm/core/include/content_key_session.h | 4 ++-- libwvdrmengine/cdm/core/include/crypto_key.h | 4 ++-- libwvdrmengine/cdm/core/include/crypto_session.h | 4 ++-- libwvdrmengine/cdm/core/include/device_files.h | 4 ++-- libwvdrmengine/cdm/core/include/entitlement_key_session.h | 4 ++-- libwvdrmengine/cdm/core/include/initialization_data.h | 4 ++-- libwvdrmengine/cdm/core/include/key_session.h | 4 ++-- libwvdrmengine/cdm/core/include/license.h | 4 ++-- libwvdrmengine/cdm/core/include/license_key_status.h | 4 ++-- libwvdrmengine/cdm/core/include/oemcrypto_adapter.h | 4 ++-- libwvdrmengine/cdm/core/include/policy_engine.h | 4 ++-- libwvdrmengine/cdm/core/include/policy_timers.h | 4 ++-- libwvdrmengine/cdm/core/include/policy_timers_v15.h | 4 ++-- libwvdrmengine/cdm/core/include/policy_timers_v16.h | 4 ++-- libwvdrmengine/cdm/core/include/privacy_crypto.h | 4 ++-- libwvdrmengine/cdm/core/include/properties.h | 4 ++-- libwvdrmengine/cdm/core/include/service_certificate.h | 4 ++-- libwvdrmengine/cdm/core/include/usage_table_header.h | 4 ++-- libwvdrmengine/cdm/core/include/wv_cdm_constants.h | 4 ++-- libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h | 4 ++-- libwvdrmengine/cdm/core/include/wv_cdm_types.h | 4 ++-- libwvdrmengine/cdm/core/src/buffer_reader.cpp | 4 ++-- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 4 ++-- libwvdrmengine/cdm/core/src/cdm_engine_factory.cpp | 4 ++-- libwvdrmengine/cdm/core/src/cdm_session.cpp | 4 ++-- libwvdrmengine/cdm/core/src/cdm_session_map.cpp | 4 ++-- libwvdrmengine/cdm/core/src/certificate_provisioning.cpp | 4 ++-- libwvdrmengine/cdm/core/src/client_identification.cpp | 4 ++-- libwvdrmengine/cdm/core/src/content_key_session.cpp | 4 ++-- libwvdrmengine/cdm/core/src/crypto_session.cpp | 4 ++-- libwvdrmengine/cdm/core/src/device_files.cpp | 4 ++-- libwvdrmengine/cdm/core/src/device_files.proto | 4 ++-- libwvdrmengine/cdm/core/src/entitlement_key_session.cpp | 4 ++-- libwvdrmengine/cdm/core/src/initialization_data.cpp | 4 ++-- libwvdrmengine/cdm/core/src/license.cpp | 4 ++-- libwvdrmengine/cdm/core/src/license_key_status.cpp | 4 ++-- libwvdrmengine/cdm/core/src/license_protocol.proto | 4 ++-- libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp | 4 ++-- libwvdrmengine/cdm/core/src/policy_engine.cpp | 4 ++-- libwvdrmengine/cdm/core/src/policy_timers.cpp | 4 ++-- libwvdrmengine/cdm/core/src/policy_timers_v15.cpp | 4 ++-- libwvdrmengine/cdm/core/src/policy_timers_v16.cpp | 4 ++-- libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp | 4 ++-- libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp | 4 ++-- libwvdrmengine/cdm/core/src/properties.cpp | 4 ++-- libwvdrmengine/cdm/core/src/service_certificate.cpp | 4 ++-- libwvdrmengine/cdm/core/src/usage_table_header.cpp | 4 ++-- libwvdrmengine/cdm/core/test/buffer_reader_test.cpp | 4 ++-- .../cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/cdm_engine_test.cpp | 4 ++-- libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp | 4 ++-- .../cdm/core/test/certificate_provisioning_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/config_test_env.cpp | 4 ++-- libwvdrmengine/cdm/core/test/config_test_env.h | 4 ++-- libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/device_files_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/fake_provisioning_server.cpp | 4 ++-- libwvdrmengine/cdm/core/test/fake_provisioning_server.h | 4 ++-- libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/http_socket.cpp | 4 ++-- libwvdrmengine/cdm/core/test/http_socket.h | 4 ++-- libwvdrmengine/cdm/core/test/http_socket_test.cpp | 4 ++-- libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/license_keys_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/license_request.cpp | 4 ++-- libwvdrmengine/cdm/core/test/license_request.h | 4 ++-- libwvdrmengine/cdm/core/test/license_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/mock_clock.h | 4 ++-- .../cdm/core/test/policy_engine_constraints_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/rw_lock_test.cpp | 4 ++-- libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/test_base.cpp | 4 ++-- libwvdrmengine/cdm/core/test/test_base.h | 4 ++-- libwvdrmengine/cdm/core/test/test_main.cpp | 4 ++-- libwvdrmengine/cdm/core/test/test_printers.cpp | 4 ++-- libwvdrmengine/cdm/core/test/test_printers.h | 4 ++-- libwvdrmengine/cdm/core/test/url_request.cpp | 4 ++-- libwvdrmengine/cdm/core/test/url_request.h | 4 ++-- libwvdrmengine/cdm/core/test/url_request_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp | 4 ++-- 90 files changed, 180 insertions(+), 180 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/buffer_reader.h b/libwvdrmengine/cdm/core/include/buffer_reader.h index e9bcfb60..4730610a 100644 --- a/libwvdrmengine/cdm/core/include/buffer_reader.h +++ b/libwvdrmengine/cdm/core/include/buffer_reader.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_BUFFER_READER_H_ #define WVCDM_CORE_BUFFER_READER_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_client_property_set.h b/libwvdrmengine/cdm/core/include/cdm_client_property_set.h index e6c7ba4c..4c3071db 100644 --- a/libwvdrmengine/cdm/core/include/cdm_client_property_set.h +++ b/libwvdrmengine/cdm/core/include/cdm_client_property_set.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_ #define WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_engine.h b/libwvdrmengine/cdm/core/include/cdm_engine.h index 16a4e1f1..6f9334a2 100644 --- a/libwvdrmengine/cdm/core/include/cdm_engine.h +++ b/libwvdrmengine/cdm/core/include/cdm_engine.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_ENGINE_H_ #define WVCDM_CORE_CDM_ENGINE_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_engine_factory.h b/libwvdrmengine/cdm/core/include/cdm_engine_factory.h index 5cd0e88e..07c3d273 100644 --- a/libwvdrmengine/cdm/core/include/cdm_engine_factory.h +++ b/libwvdrmengine/cdm/core/include/cdm_engine_factory.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_ENGINE_FACTORY_H_ #define WVCDM_CORE_CDM_ENGINE_FACTORY_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h b/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h index 5eb7d9a0..6b82775d 100644 --- a/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h +++ b/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h @@ -1,7 +1,7 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_ENGINE_METRICS_DECORATOR_H_ #define WVCDM_CORE_CDM_ENGINE_METRICS_DECORATOR_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_session.h b/libwvdrmengine/cdm/core/include/cdm_session.h index e173e8a4..58c6fd41 100644 --- a/libwvdrmengine/cdm/core/include/cdm_session.h +++ b/libwvdrmengine/cdm/core/include/cdm_session.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_SESSION_H_ #define WVCDM_CORE_CDM_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/cdm_session_map.h b/libwvdrmengine/cdm/core/include/cdm_session_map.h index 74b54906..61897ec8 100644 --- a/libwvdrmengine/cdm/core/include/cdm_session_map.h +++ b/libwvdrmengine/cdm/core/include/cdm_session_map.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CDM_SESSION_MAP_H_ #define WVCDM_CORE_CDM_SESSION_MAP_H_ diff --git a/libwvdrmengine/cdm/core/include/certificate_provisioning.h b/libwvdrmengine/cdm/core/include/certificate_provisioning.h index 5d75c6a4..392188d6 100644 --- a/libwvdrmengine/cdm/core/include/certificate_provisioning.h +++ b/libwvdrmengine/cdm/core/include/certificate_provisioning.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CERTIFICATE_PROVISIONING_H_ #define WVCDM_CORE_CERTIFICATE_PROVISIONING_H_ diff --git a/libwvdrmengine/cdm/core/include/client_identification.h b/libwvdrmengine/cdm/core/include/client_identification.h index 32462b42..ed96de0a 100644 --- a/libwvdrmengine/cdm/core/include/client_identification.h +++ b/libwvdrmengine/cdm/core/include/client_identification.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CLIENT_IDENTIFICATION_H_ #define WVCDM_CORE_CLIENT_IDENTIFICATION_H_ diff --git a/libwvdrmengine/cdm/core/include/content_key_session.h b/libwvdrmengine/cdm/core/include/content_key_session.h index 9e784547..209242dc 100644 --- a/libwvdrmengine/cdm/core/include/content_key_session.h +++ b/libwvdrmengine/cdm/core/include/content_key_session.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CONTENT_KEY_SESSION_H_ #define WVCDM_CORE_CONTENT_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/crypto_key.h b/libwvdrmengine/cdm/core/include/crypto_key.h index 9614e597..f0bfcfb9 100644 --- a/libwvdrmengine/cdm/core/include/crypto_key.h +++ b/libwvdrmengine/cdm/core/include/crypto_key.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CRYPTO_KEY_H_ #define WVCDM_CORE_CRYPTO_KEY_H_ diff --git a/libwvdrmengine/cdm/core/include/crypto_session.h b/libwvdrmengine/cdm/core/include/crypto_session.h index 1e44b94a..139bb466 100644 --- a/libwvdrmengine/cdm/core/include/crypto_session.h +++ b/libwvdrmengine/cdm/core/include/crypto_session.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_CRYPTO_SESSION_H_ #define WVCDM_CORE_CRYPTO_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/device_files.h b/libwvdrmengine/cdm/core/include/device_files.h index 70f55e36..6add2dd0 100644 --- a/libwvdrmengine/cdm/core/include/device_files.h +++ b/libwvdrmengine/cdm/core/include/device_files.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // #ifndef WVCDM_CORE_DEVICE_FILES_H_ #define WVCDM_CORE_DEVICE_FILES_H_ diff --git a/libwvdrmengine/cdm/core/include/entitlement_key_session.h b/libwvdrmengine/cdm/core/include/entitlement_key_session.h index 358ec92d..797da114 100644 --- a/libwvdrmengine/cdm/core/include/entitlement_key_session.h +++ b/libwvdrmengine/cdm/core/include/entitlement_key_session.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_ #define WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/initialization_data.h b/libwvdrmengine/cdm/core/include/initialization_data.h index 1cca1b3b..02c216cc 100644 --- a/libwvdrmengine/cdm/core/include/initialization_data.h +++ b/libwvdrmengine/cdm/core/include/initialization_data.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CORE_INCLUDE_INITIALIZATION_DATA_H_ #define CORE_INCLUDE_INITIALIZATION_DATA_H_ diff --git a/libwvdrmengine/cdm/core/include/key_session.h b/libwvdrmengine/cdm/core/include/key_session.h index c823ee49..22d50ea2 100644 --- a/libwvdrmengine/cdm/core/include/key_session.h +++ b/libwvdrmengine/cdm/core/include/key_session.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_KEY_SESSION_H_ #define WVCDM_CORE_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/license.h b/libwvdrmengine/cdm/core/include/license.h index b8483274..c7d4567a 100644 --- a/libwvdrmengine/cdm/core/include/license.h +++ b/libwvdrmengine/cdm/core/include/license.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_LICENSE_H_ #define WVCDM_CORE_LICENSE_H_ diff --git a/libwvdrmengine/cdm/core/include/license_key_status.h b/libwvdrmengine/cdm/core/include/license_key_status.h index 1c0d46f1..cb88275a 100644 --- a/libwvdrmengine/cdm/core/include/license_key_status.h +++ b/libwvdrmengine/cdm/core/include/license_key_status.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_LICENSE_KEY_STATUS_H_ #define WVCDM_CORE_LICENSE_KEY_STATUS_H_ diff --git a/libwvdrmengine/cdm/core/include/oemcrypto_adapter.h b/libwvdrmengine/cdm/core/include/oemcrypto_adapter.h index d39fbb37..e52c519d 100644 --- a/libwvdrmengine/cdm/core/include/oemcrypto_adapter.h +++ b/libwvdrmengine/cdm/core/include/oemcrypto_adapter.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // #ifndef WVCDM_CORE_OEMCRYPTO_ADAPTER_H_ #define WVCDM_CORE_OEMCRYPTO_ADAPTER_H_ diff --git a/libwvdrmengine/cdm/core/include/policy_engine.h b/libwvdrmengine/cdm/core/include/policy_engine.h index d71c2387..2d12ffab 100644 --- a/libwvdrmengine/cdm/core/include/policy_engine.h +++ b/libwvdrmengine/cdm/core/include/policy_engine.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_POLICY_ENGINE_H_ #define WVCDM_CORE_POLICY_ENGINE_H_ diff --git a/libwvdrmengine/cdm/core/include/policy_timers.h b/libwvdrmengine/cdm/core/include/policy_timers.h index c0df728d..4287b0cf 100644 --- a/libwvdrmengine/cdm/core/include/policy_timers.h +++ b/libwvdrmengine/cdm/core/include/policy_timers.h @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_POLICY_TIMERS_H_ #define WVCDM_CORE_POLICY_TIMERS_H_ diff --git a/libwvdrmengine/cdm/core/include/policy_timers_v15.h b/libwvdrmengine/cdm/core/include/policy_timers_v15.h index c1344d2e..ed3ca71a 100644 --- a/libwvdrmengine/cdm/core/include/policy_timers_v15.h +++ b/libwvdrmengine/cdm/core/include/policy_timers_v15.h @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_POLICY_TIMERS_V15_H_ #define WVCDM_CORE_POLICY_TIMERS_V15_H_ diff --git a/libwvdrmengine/cdm/core/include/policy_timers_v16.h b/libwvdrmengine/cdm/core/include/policy_timers_v16.h index 924b5ea1..6efa7c69 100644 --- a/libwvdrmengine/cdm/core/include/policy_timers_v16.h +++ b/libwvdrmengine/cdm/core/include/policy_timers_v16.h @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_POLICY_TIMERS_V16_H_ #define WVCDM_CORE_POLICY_TIMERS_V16_H_ diff --git a/libwvdrmengine/cdm/core/include/privacy_crypto.h b/libwvdrmengine/cdm/core/include/privacy_crypto.h index 0ba6ba5e..eea1d3bd 100644 --- a/libwvdrmengine/cdm/core/include/privacy_crypto.h +++ b/libwvdrmengine/cdm/core/include/privacy_crypto.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Description: // Declaration of classes representing AES and RSA public keys used diff --git a/libwvdrmengine/cdm/core/include/properties.h b/libwvdrmengine/cdm/core/include/properties.h index 04910ead..34eeaa32 100644 --- a/libwvdrmengine/cdm/core/include/properties.h +++ b/libwvdrmengine/cdm/core/include/properties.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_PROPERTIES_H_ #define WVCDM_CORE_PROPERTIES_H_ diff --git a/libwvdrmengine/cdm/core/include/service_certificate.h b/libwvdrmengine/cdm/core/include/service_certificate.h index 75f2eec5..7bd80b26 100644 --- a/libwvdrmengine/cdm/core/include/service_certificate.h +++ b/libwvdrmengine/cdm/core/include/service_certificate.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // #ifndef WVCDM_CORE_SERVICE_CERTIFICATE_H_ #define WVCDM_CORE_SERVICE_CERTIFICATE_H_ diff --git a/libwvdrmengine/cdm/core/include/usage_table_header.h b/libwvdrmengine/cdm/core/include/usage_table_header.h index d63bdcb1..ab5ac80e 100644 --- a/libwvdrmengine/cdm/core/include/usage_table_header.h +++ b/libwvdrmengine/cdm/core/include/usage_table_header.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_USAGE_TABLE_HEADER_H_ #define WVCDM_CORE_USAGE_TABLE_HEADER_H_ diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_constants.h b/libwvdrmengine/cdm/core/include/wv_cdm_constants.h index 9724011e..d10c5929 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_constants.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_constants.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_WV_CDM_CONSTANTS_H_ #define WVCDM_CORE_WV_CDM_CONSTANTS_H_ diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h b/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h index 1713d172..1c030ff6 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_WV_CDM_EVENT_LISTENER_H_ #define WVCDM_CORE_WV_CDM_EVENT_LISTENER_H_ diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h index 5d6f8b9a..a4075304 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_WV_CDM_TYPES_H_ #define WVCDM_CORE_WV_CDM_TYPES_H_ diff --git a/libwvdrmengine/cdm/core/src/buffer_reader.cpp b/libwvdrmengine/cdm/core/src/buffer_reader.cpp index df648eb3..3601ac17 100644 --- a/libwvdrmengine/cdm/core/src/buffer_reader.cpp +++ b/libwvdrmengine/cdm/core/src/buffer_reader.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "buffer_reader.h" diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index 0d7745cb..4af23b18 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "cdm_engine.h" diff --git a/libwvdrmengine/cdm/core/src/cdm_engine_factory.cpp b/libwvdrmengine/cdm/core/src/cdm_engine_factory.cpp index 28363fc4..9fac0819 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine_factory.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine_factory.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "cdm_engine_factory.h" diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp index 7184bc14..7bf0647a 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "cdm_session.h" diff --git a/libwvdrmengine/cdm/core/src/cdm_session_map.cpp b/libwvdrmengine/cdm/core/src/cdm_session_map.cpp index f7b107bf..6bc30cf8 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session_map.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session_map.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "cdm_session_map.h" diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp index 7f35608f..68a6ba02 100644 --- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp +++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "certificate_provisioning.h" diff --git a/libwvdrmengine/cdm/core/src/client_identification.cpp b/libwvdrmengine/cdm/core/src/client_identification.cpp index 1885ae26..a1f012e6 100644 --- a/libwvdrmengine/cdm/core/src/client_identification.cpp +++ b/libwvdrmengine/cdm/core/src/client_identification.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "client_identification.h" diff --git a/libwvdrmengine/cdm/core/src/content_key_session.cpp b/libwvdrmengine/cdm/core/src/content_key_session.cpp index 83339740..3c808d32 100644 --- a/libwvdrmengine/cdm/core/src/content_key_session.cpp +++ b/libwvdrmengine/cdm/core/src/content_key_session.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "content_key_session.h" diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index c2f186d9..e5e468ac 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Crypto - wrapper classes for OEMCrypto interface // diff --git a/libwvdrmengine/cdm/core/src/device_files.cpp b/libwvdrmengine/cdm/core/src/device_files.cpp index 923de336..0385cdbd 100644 --- a/libwvdrmengine/cdm/core/src/device_files.cpp +++ b/libwvdrmengine/cdm/core/src/device_files.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "device_files.h" diff --git a/libwvdrmengine/cdm/core/src/device_files.proto b/libwvdrmengine/cdm/core/src/device_files.proto index 8190ba3d..21eafe42 100644 --- a/libwvdrmengine/cdm/core/src/device_files.proto +++ b/libwvdrmengine/cdm/core/src/device_files.proto @@ -2,8 +2,8 @@ // device_files.proto // ---------------------------------------------------------------------------- // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Description: // Format of various files stored at the device. diff --git a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp index baf99d72..8a8b4576 100644 --- a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp +++ b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "entitlement_key_session.h" diff --git a/libwvdrmengine/cdm/core/src/initialization_data.cpp b/libwvdrmengine/cdm/core/src/initialization_data.cpp index cfcc28f5..1ff2b082 100644 --- a/libwvdrmengine/cdm/core/src/initialization_data.cpp +++ b/libwvdrmengine/cdm/core/src/initialization_data.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "initialization_data.h" diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp index f712c044..0f3e3d7b 100644 --- a/libwvdrmengine/cdm/core/src/license.cpp +++ b/libwvdrmengine/cdm/core/src/license.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "license.h" diff --git a/libwvdrmengine/cdm/core/src/license_key_status.cpp b/libwvdrmengine/cdm/core/src/license_key_status.cpp index d404492a..a4fc365b 100644 --- a/libwvdrmengine/cdm/core/src/license_key_status.cpp +++ b/libwvdrmengine/cdm/core/src/license_key_status.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "license_key_status.h" diff --git a/libwvdrmengine/cdm/core/src/license_protocol.proto b/libwvdrmengine/cdm/core/src/license_protocol.proto index 11d6b6b1..d2164e22 100644 --- a/libwvdrmengine/cdm/core/src/license_protocol.proto +++ b/libwvdrmengine/cdm/core/src/license_protocol.proto @@ -2,8 +2,8 @@ // license_protocol.proto // ---------------------------------------------------------------------------- // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. syntax = "proto2"; diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 37fd1d7d..a987eca2 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Wrapper of OEMCrypto APIs for platforms that support both Levels 1 and 3. // This should be used when liboemcrypto.so is dynamically loaded at run diff --git a/libwvdrmengine/cdm/core/src/policy_engine.cpp b/libwvdrmengine/cdm/core/src/policy_engine.cpp index b244c675..c2be3dd6 100644 --- a/libwvdrmengine/cdm/core/src/policy_engine.cpp +++ b/libwvdrmengine/cdm/core/src/policy_engine.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "policy_engine.h" diff --git a/libwvdrmengine/cdm/core/src/policy_timers.cpp b/libwvdrmengine/cdm/core/src/policy_timers.cpp index 84ba84da..55c54b4a 100644 --- a/libwvdrmengine/cdm/core/src/policy_timers.cpp +++ b/libwvdrmengine/cdm/core/src/policy_timers.cpp @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "policy_timers.h" diff --git a/libwvdrmengine/cdm/core/src/policy_timers_v15.cpp b/libwvdrmengine/cdm/core/src/policy_timers_v15.cpp index a8a33f01..f917c061 100644 --- a/libwvdrmengine/cdm/core/src/policy_timers_v15.cpp +++ b/libwvdrmengine/cdm/core/src/policy_timers_v15.cpp @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "policy_timers_v15.h" diff --git a/libwvdrmengine/cdm/core/src/policy_timers_v16.cpp b/libwvdrmengine/cdm/core/src/policy_timers_v16.cpp index 6af479d3..4395a562 100644 --- a/libwvdrmengine/cdm/core/src/policy_timers_v16.cpp +++ b/libwvdrmengine/cdm/core/src/policy_timers_v16.cpp @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "policy_timers_v16.h" diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp index b35a78bb..908cb7dc 100644 --- a/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp +++ b/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Description: // Definition of classes representing RSA public keys used diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp index 87412a95..8b100c59 100644 --- a/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp +++ b/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // // Description: // Dummy version of privacy crypto classes for systems which diff --git a/libwvdrmengine/cdm/core/src/properties.cpp b/libwvdrmengine/cdm/core/src/properties.cpp index e1bd17af..1eeb8e17 100644 --- a/libwvdrmengine/cdm/core/src/properties.cpp +++ b/libwvdrmengine/cdm/core/src/properties.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "properties.h" diff --git a/libwvdrmengine/cdm/core/src/service_certificate.cpp b/libwvdrmengine/cdm/core/src/service_certificate.cpp index 55ab57c4..28bba818 100644 --- a/libwvdrmengine/cdm/core/src/service_certificate.cpp +++ b/libwvdrmengine/cdm/core/src/service_certificate.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "service_certificate.h" diff --git a/libwvdrmengine/cdm/core/src/usage_table_header.cpp b/libwvdrmengine/cdm/core/src/usage_table_header.cpp index ecbcecfe..440f9b00 100644 --- a/libwvdrmengine/cdm/core/src/usage_table_header.cpp +++ b/libwvdrmengine/cdm/core/src/usage_table_header.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "usage_table_header.h" diff --git a/libwvdrmengine/cdm/core/test/buffer_reader_test.cpp b/libwvdrmengine/cdm/core/test/buffer_reader_test.cpp index 4ebd0e10..14c5307a 100644 --- a/libwvdrmengine/cdm/core/test/buffer_reader_test.cpp +++ b/libwvdrmengine/cdm/core/test/buffer_reader_test.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp index 1c376dfa..1b981cdb 100644 --- a/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This fil and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // These tests are for the cdm engine metrics implementation. They ensure that // The cdm engine metrics impl is correctly forwarding calls to the internal diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp index 81695ea9..52f068ce 100644 --- a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // These tests are for the cdm engine, and code below it in the stack. In // particular, we assume that the OEMCrypo layer works, and has a valid keybox. // This is because we need a valid RSA certificate, and will attempt to connect diff --git a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp index c9626f82..d3c32dbc 100644 --- a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include diff --git a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp index 6c7d0b28..aaf00974 100644 --- a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "certificate_provisioning.h" diff --git a/libwvdrmengine/cdm/core/test/config_test_env.cpp b/libwvdrmengine/cdm/core/test/config_test_env.cpp index de3621d4..e2d46ba2 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.cpp +++ b/libwvdrmengine/cdm/core/test/config_test_env.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "config_test_env.h" #include "string_conversions.h" diff --git a/libwvdrmengine/cdm/core/test/config_test_env.h b/libwvdrmengine/cdm/core/test/config_test_env.h index 4daa28e9..e3247df3 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.h +++ b/libwvdrmengine/cdm/core/test/config_test_env.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CDM_TEST_CONFIG_TEST_ENV_H_ #define CDM_TEST_CONFIG_TEST_ENV_H_ diff --git a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp index 96bba6af..8e3ac9de 100644 --- a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp index 1c8d6ed2..25cc5553 100644 --- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "device_files.h" diff --git a/libwvdrmengine/cdm/core/test/fake_provisioning_server.cpp b/libwvdrmengine/cdm/core/test/fake_provisioning_server.cpp index d8d725a7..b429ff43 100644 --- a/libwvdrmengine/cdm/core/test/fake_provisioning_server.cpp +++ b/libwvdrmengine/cdm/core/test/fake_provisioning_server.cpp @@ -1,6 +1,6 @@ // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "fake_provisioning_server.h" diff --git a/libwvdrmengine/cdm/core/test/fake_provisioning_server.h b/libwvdrmengine/cdm/core/test/fake_provisioning_server.h index 77dbeb8b..094c3a7a 100644 --- a/libwvdrmengine/cdm/core/test/fake_provisioning_server.h +++ b/libwvdrmengine/cdm/core/test/fake_provisioning_server.h @@ -1,6 +1,6 @@ // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_FAKE_PROVISIONING_SERVER_H_ #define WVCDM_CORE_FAKE_PROVISIONING_SERVER_H_ diff --git a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp index d0fe19bb..7e796b11 100644 --- a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // These tests are for the generic crypto operations. They call on the // CdmEngine class and exercise the classes below it as well. In // particular, we assume that the OEMCrypo layer works, and has a valid keybox. diff --git a/libwvdrmengine/cdm/core/test/http_socket.cpp b/libwvdrmengine/cdm/core/test/http_socket.cpp index 6769ebb9..0bce6275 100644 --- a/libwvdrmengine/cdm/core/test/http_socket.cpp +++ b/libwvdrmengine/cdm/core/test/http_socket.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "http_socket.h" diff --git a/libwvdrmengine/cdm/core/test/http_socket.h b/libwvdrmengine/cdm/core/test/http_socket.h index f3ce53c9..4c7bc305 100644 --- a/libwvdrmengine/cdm/core/test/http_socket.h +++ b/libwvdrmengine/cdm/core/test/http_socket.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CDM_TEST_HTTP_SOCKET_H_ #define CDM_TEST_HTTP_SOCKET_H_ diff --git a/libwvdrmengine/cdm/core/test/http_socket_test.cpp b/libwvdrmengine/cdm/core/test/http_socket_test.cpp index 72a0d043..8de2d0d3 100644 --- a/libwvdrmengine/cdm/core/test/http_socket_test.cpp +++ b/libwvdrmengine/cdm/core/test/http_socket_test.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp index b30d2c7b..95356fd3 100644 --- a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp b/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp index 5c08bd11..486e2f7b 100644 --- a/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/license_request.cpp b/libwvdrmengine/cdm/core/test/license_request.cpp index 978c66a2..7403b21c 100644 --- a/libwvdrmengine/cdm/core/test/license_request.cpp +++ b/libwvdrmengine/cdm/core/test/license_request.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "license_request.h" #include "log.h" diff --git a/libwvdrmengine/cdm/core/test/license_request.h b/libwvdrmengine/cdm/core/test/license_request.h index 6188d8e4..37b42883 100644 --- a/libwvdrmengine/cdm/core/test/license_request.h +++ b/libwvdrmengine/cdm/core/test/license_request.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CDM_TEST_LICENSE_REQUEST_H_ #define CDM_TEST_LICENSE_REQUEST_H_ diff --git a/libwvdrmengine/cdm/core/test/license_unittest.cpp b/libwvdrmengine/cdm/core/test/license_unittest.cpp index 7645b095..84e39dff 100644 --- a/libwvdrmengine/cdm/core/test/license_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/license_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/mock_clock.h b/libwvdrmengine/cdm/core/test/mock_clock.h index 98aae348..b57f1a10 100644 --- a/libwvdrmengine/cdm/core/test/mock_clock.h +++ b/libwvdrmengine/cdm/core/test/mock_clock.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CDM_TEST_MOCK_CLOCK_H_ #define CDM_TEST_MOCK_CLOCK_H_ diff --git a/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp index dce74ef0..c9d3d9b1 100644 --- a/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp index b4063f73..3b020db7 100644 --- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include diff --git a/libwvdrmengine/cdm/core/test/rw_lock_test.cpp b/libwvdrmengine/cdm/core/test/rw_lock_test.cpp index 68d6e56a..f97c6d63 100644 --- a/libwvdrmengine/cdm/core/test/rw_lock_test.cpp +++ b/libwvdrmengine/cdm/core/test/rw_lock_test.cpp @@ -1,6 +1,6 @@ // Copyright 2019 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include #include diff --git a/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp b/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp index 6958d307..dd70537c 100644 --- a/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "service_certificate.h" #include diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp index b527645b..f225e24e 100644 --- a/libwvdrmengine/cdm/core/test/test_base.cpp +++ b/libwvdrmengine/cdm/core/test/test_base.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "test_base.h" diff --git a/libwvdrmengine/cdm/core/test/test_base.h b/libwvdrmengine/cdm/core/test/test_base.h index c6ba927f..e1553ee5 100644 --- a/libwvdrmengine/cdm/core/test/test_base.h +++ b/libwvdrmengine/cdm/core/test/test_base.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef WVCDM_CORE_TEST_BASE_H_ #define WVCDM_CORE_TEST_BASE_H_ diff --git a/libwvdrmengine/cdm/core/test/test_main.cpp b/libwvdrmengine/cdm/core/test/test_main.cpp index 5f74aa71..1651a565 100644 --- a/libwvdrmengine/cdm/core/test/test_main.cpp +++ b/libwvdrmengine/cdm/core/test/test_main.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // Use in place of the gtest_main in order to initialize the WvCdmTestBase using // command line parameters. diff --git a/libwvdrmengine/cdm/core/test/test_printers.cpp b/libwvdrmengine/cdm/core/test/test_printers.cpp index 05ea0660..5cb8db6e 100644 --- a/libwvdrmengine/cdm/core/test/test_printers.cpp +++ b/libwvdrmengine/cdm/core/test/test_printers.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // This file adds some print methods so that when unit tests fail, the // will print the name of an enumeration instead of the numeric value. diff --git a/libwvdrmengine/cdm/core/test/test_printers.h b/libwvdrmengine/cdm/core/test/test_printers.h index 42bed79c..0df9d06e 100644 --- a/libwvdrmengine/cdm/core/test/test_printers.h +++ b/libwvdrmengine/cdm/core/test/test_printers.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. // This file adds some print methods so that when unit tests fail, the // will print the name of an enumeration instead of the numeric value. diff --git a/libwvdrmengine/cdm/core/test/url_request.cpp b/libwvdrmengine/cdm/core/test/url_request.cpp index ba7f7ef1..c2fb1ec9 100644 --- a/libwvdrmengine/cdm/core/test/url_request.cpp +++ b/libwvdrmengine/cdm/core/test/url_request.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "url_request.h" diff --git a/libwvdrmengine/cdm/core/test/url_request.h b/libwvdrmengine/cdm/core/test/url_request.h index 550894f1..0d6e4623 100644 --- a/libwvdrmengine/cdm/core/test/url_request.h +++ b/libwvdrmengine/cdm/core/test/url_request.h @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #ifndef CDM_TEST_URL_REQUEST_H_ #define CDM_TEST_URL_REQUEST_H_ diff --git a/libwvdrmengine/cdm/core/test/url_request_unittest.cpp b/libwvdrmengine/cdm/core/test/url_request_unittest.cpp index 18261a79..4dde2b2c 100644 --- a/libwvdrmengine/cdm/core/test/url_request_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/url_request_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "url_request.h" diff --git a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp index 87d87ecf..bfa0fae4 100644 --- a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine Master -// License Agreement. +// source code may only be used and distributed under the Widevine License +// Agreement. #include "usage_table_header.h"