From 60d010d18d7b532b5ff04859666c2c850dfd77d0 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Tue, 10 Jul 2018 15:06:58 -0700 Subject: [PATCH] Address review comments Merge from Widevine repo of http://go/wvgerrit/54540 Addressing comments in http://go/ag/4448747 Test: tested as part of http://go/ag/4674759 Change-Id: I29005397efcc2e982e635581cc68c8293cea6243 --- libwvdrmengine/cdm/core/include/cdm_session.h | 2 +- libwvdrmengine/cdm/core/include/content_key_session.h | 6 +++--- libwvdrmengine/cdm/core/include/crypto_session.h | 6 +++--- libwvdrmengine/cdm/core/include/entitlement_key_session.h | 6 +++--- libwvdrmengine/cdm/core/include/key_session.h | 6 +++--- libwvdrmengine/cdm/core/include/sublicense_key_session.h | 6 +++--- libwvdrmengine/cdm/util/include/clock.h | 4 +++- libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h | 4 +++- libwvdrmengine/cdm/util/include/file_store.h | 4 +++- libwvdrmengine/cdm/util/include/lock.h | 4 +++- libwvdrmengine/cdm/util/include/log.h | 4 +++- libwvdrmengine/cdm/util/include/string_conversions.h | 4 +++- libwvdrmengine/cdm/util/src/string_conversions.cpp | 4 +++- libwvdrmengine/oemcrypto/ref/README.md | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h | 2 +- .../ref/src/oemcrypto_engine_device_properties.cpp | 2 +- .../ref/src/oemcrypto_engine_device_properties_L1.cpp | 2 +- .../ref/src/oemcrypto_engine_device_properties_cert.cpp | 2 +- .../ref/src/oemcrypto_engine_device_properties_prov30.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h | 2 +- .../oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp | 2 +- .../oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h | 2 +- .../oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h | 3 +++ libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp | 2 +- libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h | 2 +- .../oemcrypto/ref/src/oemcrypto_session_key_table.cpp | 2 +- .../oemcrypto/ref/src/oemcrypto_session_key_table.h | 2 +- .../oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp | 2 +- .../oemcrypto/ref/src/oemcrypto_usage_table_ref.h | 2 +- libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp | 6 +++--- 40 files changed, 68 insertions(+), 51 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/cdm_session.h b/libwvdrmengine/cdm/core/include/cdm_session.h index 258a9ec5..9bfa638d 100644 --- a/libwvdrmengine/cdm/core/include/cdm_session.h +++ b/libwvdrmengine/cdm/core/include/cdm_session.h @@ -10,8 +10,8 @@ #include #include "crypto_session.h" -#include "disallow_copy_and_assign.h" #include "device_files.h" +#include "disallow_copy_and_assign.h" #include "file_store.h" #include "initialization_data.h" #include "license.h" diff --git a/libwvdrmengine/cdm/core/include/content_key_session.h b/libwvdrmengine/cdm/core/include/content_key_session.h index 729e8eda..005dc09e 100644 --- a/libwvdrmengine/cdm/core/include/content_key_session.h +++ b/libwvdrmengine/cdm/core/include/content_key_session.h @@ -2,8 +2,8 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. -#ifndef WVCDM_CORE_CONTENT_KEY_SESSSION_H_ -#define WVCDM_CORE_CONTENT_KEY_SESSSION_H_ +#ifndef WVCDM_CORE_CONTENT_KEY_SESSION_H_ +#define WVCDM_CORE_CONTENT_KEY_SESSION_H_ #include "key_session.h" #include "metrics_collections.h" @@ -73,4 +73,4 @@ class ContentKeySession : public KeySession { } // namespace wvcdm -#endif // WVCDM_CORE_CONTENT_KEY_SESSSION_H_ +#endif // WVCDM_CORE_CONTENT_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/crypto_session.h b/libwvdrmengine/cdm/core/include/crypto_session.h index 881187e6..4127581a 100644 --- a/libwvdrmengine/cdm/core/include/crypto_session.h +++ b/libwvdrmengine/cdm/core/include/crypto_session.h @@ -2,8 +2,8 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. -#ifndef WVCDM_CORE_CRYPTO_SESSSION_H_ -#define WVCDM_CORE_CRYPTO_SESSSION_H_ +#ifndef WVCDM_CORE_CRYPTO_SESSION_H_ +#define WVCDM_CORE_CRYPTO_SESSION_H_ #include #include @@ -296,4 +296,4 @@ class CryptoSession { } // namespace wvcdm -#endif // WVCDM_CORE_CRYPTO_SESSSION_H_ +#endif // WVCDM_CORE_CRYPTO_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/entitlement_key_session.h b/libwvdrmengine/cdm/core/include/entitlement_key_session.h index da4fee41..518962a8 100644 --- a/libwvdrmengine/cdm/core/include/entitlement_key_session.h +++ b/libwvdrmengine/cdm/core/include/entitlement_key_session.h @@ -2,8 +2,8 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. -#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_ -#define WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_ +#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_ +#define WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_ #include #include @@ -50,4 +50,4 @@ class EntitlementKeySession : public ContentKeySession { } // namespace wvcdm -#endif // WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_ +#endif // WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/key_session.h b/libwvdrmengine/cdm/core/include/key_session.h index f3e8de5a..de30a1ee 100644 --- a/libwvdrmengine/cdm/core/include/key_session.h +++ b/libwvdrmengine/cdm/core/include/key_session.h @@ -2,8 +2,8 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. -#ifndef WVCDM_CORE_KEY_SESSSION_H_ -#define WVCDM_CORE_KEY_SESSSION_H_ +#ifndef WVCDM_CORE_KEY_SESSION_H_ +#define WVCDM_CORE_KEY_SESSION_H_ #include "metrics_collections.h" @@ -47,4 +47,4 @@ typedef std::map SubLicenseSessionMap; } // namespace wvcdm -#endif // WVCDM_CORE_KEY_SESSSION_H_ +#endif // WVCDM_CORE_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/core/include/sublicense_key_session.h b/libwvdrmengine/cdm/core/include/sublicense_key_session.h index f322af72..2313e164 100644 --- a/libwvdrmengine/cdm/core/include/sublicense_key_session.h +++ b/libwvdrmengine/cdm/core/include/sublicense_key_session.h @@ -1,5 +1,5 @@ -#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_ -#define WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_ +#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_ +#define WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_ #include "crypto_key.h" #include "key_session.h" @@ -92,4 +92,4 @@ class SubLicenseKeySession : public KeySession { } // namespace wvcdm -#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_ +#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_ diff --git a/libwvdrmengine/cdm/util/include/clock.h b/libwvdrmengine/cdm/util/include/clock.h index 46565a7e..487ae26e 100644 --- a/libwvdrmengine/cdm/util/include/clock.h +++ b/libwvdrmengine/cdm/util/include/clock.h @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. // // Clock - Platform independent interface for a time library // diff --git a/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h b/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h index 37b79c26..0aefbc36 100644 --- a/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h +++ b/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h @@ -1,4 +1,6 @@ -// Copyright 2018 Google Inc. All Rights Reserved. +// 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. #ifndef WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_ #define WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_ diff --git a/libwvdrmengine/cdm/util/include/file_store.h b/libwvdrmengine/cdm/util/include/file_store.h index ef0bd60c..67872290 100644 --- a/libwvdrmengine/cdm/util/include/file_store.h +++ b/libwvdrmengine/cdm/util/include/file_store.h @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. // // File - Platform independent interface for a File class // diff --git a/libwvdrmengine/cdm/util/include/lock.h b/libwvdrmengine/cdm/util/include/lock.h index 55b5e03a..3eb288f1 100644 --- a/libwvdrmengine/cdm/util/include/lock.h +++ b/libwvdrmengine/cdm/util/include/lock.h @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. // // Lock - Platform independent interface for a Mutex class // diff --git a/libwvdrmengine/cdm/util/include/log.h b/libwvdrmengine/cdm/util/include/log.h index be9b5e03..624e0a3c 100644 --- a/libwvdrmengine/cdm/util/include/log.h +++ b/libwvdrmengine/cdm/util/include/log.h @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. // // Log - Platform independent interface for a Logging class // diff --git a/libwvdrmengine/cdm/util/include/string_conversions.h b/libwvdrmengine/cdm/util/include/string_conversions.h index efc08678..6e6d781a 100644 --- a/libwvdrmengine/cdm/util/include/string_conversions.h +++ b/libwvdrmengine/cdm/util/include/string_conversions.h @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. #ifndef WVCDM_UTIL_STRING_CONVERSIONS_H_ #define WVCDM_UTIL_STRING_CONVERSIONS_H_ diff --git a/libwvdrmengine/cdm/util/src/string_conversions.cpp b/libwvdrmengine/cdm/util/src/string_conversions.cpp index 7e7ecb76..1f5661e3 100644 --- a/libwvdrmengine/cdm/util/src/string_conversions.cpp +++ b/libwvdrmengine/cdm/util/src/string_conversions.cpp @@ -1,4 +1,6 @@ -// Copyright 2013 Google Inc. All Rights Reserved. +// 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. #include "string_conversions.h" diff --git a/libwvdrmengine/oemcrypto/ref/README.md b/libwvdrmengine/oemcrypto/ref/README.md index efb2e3ca..cf8412d0 100644 --- a/libwvdrmengine/oemcrypto/ref/README.md +++ b/libwvdrmengine/oemcrypto/ref/README.md @@ -1,5 +1,5 @@ # Reference OEMCrypto This directory contains a testing-only implementation of OEMCrypto. **This -implementation is *NOT* suitable for production use and should *NOT* be released +implementation is *NOT* suitable for production use and must *NOT* be released on devices.** diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp index 5cb4a024..8f86e13b 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_auth_ref.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h index b5c78798..523a8b28 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef OEMCRYPTO_AUTH_REF_H_ #define OEMCRYPTO_AUTH_REF_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties.cpp index aadde989..20d8f026 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_engine_ref.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_L1.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_L1.cpp index ac8a87a2..749e2e66 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_L1.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_L1.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // // This file contains oemcrypto engine properties that would be for a // level 1 device. diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_cert.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_cert.cpp index 3774eced..73809f5d 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_cert.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_cert.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // // This file contains oemcrypto engine properties that would be for a device // that does not have persistant storage or a keybox. diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_prov30.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_prov30.cpp index 12766764..dacd9793 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_prov30.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_prov30.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // // This file contains oemcrypto engine properties that would be for a // level 2 device that does not have persistant storage or a keybox. diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp index 0d11aa12..3b4f9c5f 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_engine_ref.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h index c99abb13..9fb9f0ae 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef REF_OEMCRYPTO_ENGINE_REF_H_ #define REF_OEMCRYPTO_ENGINE_REF_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp index 412a3bd0..27d78080 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_key_ref.h" #include "oemcrypto_types.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h index 894d240c..4aa38ca5 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef OEMCRYPTO_KEY_REF_H_ #define OEMCRYPTO_KEY_REF_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp index bf960558..0ed25006 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_keybox_ref.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h index 8dd2fe6d..3dec1d0e 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef OEMCRYPTO_KEYBOX_REF_H_ #define OEMCRYPTO_KEYBOX_REF_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp index 5412a960..19c7613b 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_nonce_table.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h index 6b24ac81..90175e2d 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef REF_OEMCRYPTO_NONCE_TABLE_H_ #define REF_OEMCRYPTO_NONCE_TABLE_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp index 426e2c02..e1a6cf93 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // // This is from the v12 version of oemcrypto usage tables. It is used for // devices that upgrade from v12 to v13 in the field, and need to convert from diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h index 7aa1c105..5d1b7a82 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // // This is from the v12 version of oemcrypto usage tables. It is used for // devices that upgrade from v12 to v13 in the field, and need to convert from diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp index 1166564c..a59bd39b 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_rsa_key_shared.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h index 5910b376..c80745d3 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef OEMCRYPTO_RSA_KEY_SHARED_H_ #define OEMCRYPTO_RSA_KEY_SHARED_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h index d631858a..994ec181 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h @@ -1,3 +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. #ifndef OEMCRYPTO_SCOPED_PTR_H_ #define OEMCRYPTO_SCOPED_PTR_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp index 559fbfe8..cc29b6fd 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_session.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h index 11be5197..bfe228bf 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef REF_OEMCRYPTO_SESSION_H_ #define REF_OEMCRYPTO_SESSION_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp index e8e737a6..105d2b74 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_session_key_table.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h index 694e19d8..f26b9c99 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef REF_OEMCRYPTO_SESSION_KEY_TABLE_H_ #define REF_OEMCRYPTO_SESSION_KEY_TABLE_H_ diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp index 564632e2..37c4cfd5 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #include "oemcrypto_usage_table_ref.h" diff --git a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h index b9cf64b9..b97a583f 100644 --- a/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h +++ b/libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h @@ -2,7 +2,7 @@ // source code may only be used and distributed under the Widevine Master // License Agreement. // -// Ref implementation of OEMCrypto APIs +// Reference implementation of OEMCrypto APIs // #ifndef OEMCRYPTO_USAGE_TABLE_REF_H_ #define OEMCRYPTO_USAGE_TABLE_REF_H_ diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp index e5a5fd52..05319c2a 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp @@ -142,10 +142,10 @@ TEST_F(OEMCryptoAndroidOCTest, MinVersionNumber13) { ASSERT_GE(version, 13u); } -// These tests are required for Pi MR1 Android devices. -class OEMCryptoAndroidPiMR1Test : public OEMCryptoAndroidOCTest {}; +// These tests are required for Q Android devices. +class OEMCryptoAndroidQTest : public OEMCryptoAndroidOCTest {}; -TEST_F(OEMCryptoAndroidPiMR1Test, MinVersionNumber14) { +TEST_F(OEMCryptoAndroidQTest, MinVersionNumber14) { uint32_t version = OEMCrypto_APIVersion(); ASSERT_GE(version, 14u); }