Refactor oemcrypto mock into stand alone reference code

Merge from Widevine repo of http://go/wvgerrit/46204
Refactor utility code - split the mock, step 1

Merge from Widevine repo of http://go/wvgerrit/46205
Move some OEMCrypto types to common header - split the mock, step 2

Merge from Widevine repo of http://go/wvgerrit/46206
Split mock into two -- step 3

Merge from Widevine repo of http://go/wvgerrit/47460
Split the mock into two -- step 3.5

The CL moves several files used by oemcrypto and cdm into a common
subdirectory, so that it may more easily be shared with partners.

The CORE_DISALLOW_COPY_AND_ASSIGN macro was moved to its own header in
the util/include directory.

This CL removes some references to the mock from other code, and puts
some constants and types, such as the definition of the keybox, into a
header in oemcrypto.

Test: tested as part of http://go/ag/4674759
bug: 76393338
Change-Id: I75b4bde7062ed8ee572c97ebc2f4da018f4be0c9

libwvdrmengine/cdm/Android.mk

@@ -9,6 +9,7 @@ LOCAL_CFLAGS := -DDYNAMIC_ADAPTER
 LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/metrics/include \
+    vendor/widevine/libwvdrmengine/cdm/util/include \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
 

libwvdrmengine/cdm/core/include/buffer_reader.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "wv_cdm_types.h"
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -13,6 +13,7 @@
 #include "certificate_provisioning.h"
 #include "clock.h"
 #include "crypto_session.h"
+#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "initialization_data.h"
 #include "lock.h"

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "crypto_session.h"
+#include "disallow_copy_and_assign.h"
 #include "device_files.h"
 #include "file_store.h"
 #include "initialization_data.h"

libwvdrmengine/cdm/core/include/cdm_session_map.h

@@ -10,6 +10,8 @@
 #include <string>
 
 #include "cdm_session.h"
+#include "disallow_copy_and_assign.h"
+#include "lock.h"
 #include "shared_ptr.h"
 #include "wv_cdm_types.h"
 

libwvdrmengine/cdm/core/include/certificate_provisioning.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "crypto_session.h"
+#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"

libwvdrmengine/cdm/core/include/client_identification.h

@@ -8,6 +8,7 @@
 // ClientIdentification fills in the ClientIdentification portion
 // of the License or Provisioning request messages.
 
+#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "wv_cdm_types.h"
 

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "OEMCryptoCENC.h"
+#include "disallow_copy_and_assign.h"
 #include "key_session.h"
 #include "lock.h"
 #include "metrics_collections.h"

libwvdrmengine/cdm/core/include/device_files.h

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "device_files.pb.h"
+#include "disallow_copy_and_assign.h"
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 

libwvdrmengine/cdm/core/include/entitlement_key_session.h

@@ -31,4 +31,4 @@ class EntitlementKeySession : public ContentKeySession {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_

libwvdrmengine/cdm/core/include/key_session.h

@@ -43,4 +43,4 @@ typedef std::map<std::string, CryptoSessionId> SubLicenseSessionMap;
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_KEY_SESSSION_H_

libwvdrmengine/cdm/core/include/license.h

@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "disallow_copy_and_assign.h"
 #include "initialization_data.h"
 #include "license_protocol.pb.h"
 #include "scoped_ptr.h"

libwvdrmengine/cdm/core/include/license_key_status.h

@@ -8,6 +8,7 @@
 #include <map>
 
 #include "crypto_session.h"
+#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "wv_cdm_types.h"
 

libwvdrmengine/cdm/core/include/policy_engine.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "disallow_copy_and_assign.h"
 #include "license_key_status.h"
 #include "license_protocol.pb.h"
 #include "scoped_ptr.h"

libwvdrmengine/cdm/core/include/privacy_crypto.h

@@ -26,6 +26,7 @@
 
 #include <string>
 
+#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {

libwvdrmengine/cdm/core/include/properties.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "cdm_client_property_set.h"
+#include "disallow_copy_and_assign.h"
 #include "lock.h"
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"

libwvdrmengine/cdm/core/include/scoped_ptr.h

@@ -8,7 +8,7 @@
 #ifndef WVCDM_CORE_SCOPED_PTR_H_
 #define WVCDM_CORE_SCOPED_PTR_H_
 
-#include "wv_cdm_types.h"
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/include/service_certificate.h

@@ -15,6 +15,7 @@
 
 #include <memory>
 
+#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "privacy_crypto.h"
 #include "wv_cdm_types.h"

libwvdrmengine/cdm/core/include/usage_table_header.h

@@ -10,6 +10,7 @@
 
 #include "crypto_session.h"
 #include "device_files.h"
+#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "lock.h"
 #include "metrics_collections.h"

libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h

@@ -5,6 +5,7 @@
 #ifndef WVCDM_CORE_WV_CDM_EVENT_LISTENER_H_
 #define WVCDM_CORE_WV_CDM_EVENT_LISTENER_H_
 
+#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -155,7 +155,7 @@ enum CdmResponseType {
   /* previously RESTORE_OFFLINE_LICENSE_ERROR_1 = 112 */
   RESTORE_OFFLINE_LICENSE_ERROR_2 = 113,
   NOT_INITIALIZED_ERROR = 114, /* prior to pi, SESSION_INIT_ERROR_1 = 114 */
-  REINIT_ERROR = 115, /* prior to pi, SESSION_INIT_ERROR_2 = 115 */
+  REINIT_ERROR = 115,          /* prior to pi, SESSION_INIT_ERROR_2 = 115 */
   /* previously SESSION_INIT_GET_KEYBOX_ERROR = 116 */
   SESSION_NOT_FOUND_1 = 117,
   SESSION_NOT_FOUND_2 = 118,
@@ -345,10 +345,6 @@ enum CdmKeyStatus {
 };
 typedef std::map<KeyId, CdmKeyStatus> CdmKeyStatusMap;
 
-#define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);                    \
-  void operator=(const TypeName&)
-
 enum CdmLicenseType {
   kLicenseTypeOffline,
   kLicenseTypeStreaming,

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -13,6 +13,7 @@
 
 #include "cdm_engine.h"
 #include "config_test_env.h"
+#include "device_files.h"
 #include "initialization_data.h"
 #include "file_store.h"
 #include "license_request.h"

libwvdrmengine/cdm/core/test/config_test_env.h

@@ -6,6 +6,7 @@
 #define CDM_TEST_CONFIG_TEST_ENV_H_
 
 #include <string>
+#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
 
 // Declare class ConfigTestEnv - holds the configuration settings needed

libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp

@@ -17,8 +17,8 @@
 #include "license_request.h"
 #include "log.h"
 #include "oec_session_util.h"
-#include "../../oemcrypto/mock/src/oemcrypto_key_mock.h"
 #include "oemcrypto_session_tests_helper.h"
+#include "oemcrypto_types.h"
 #include "properties.h"
 #include "string_conversions.h"
 #include "url_request.h"
@@ -113,13 +113,13 @@ class WvGenericOperationsTest : public testing::Test,
     ASSERT_NO_FATAL_FAILURE(
         oec_util_session_.FillSimpleMessage(duration, control, nonce, pst));
     oec_util_session_.license().keys[kGenericEncrypt].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowEncrypt);
+        htonl(wvoec::kControlAllowEncrypt);
     oec_util_session_.license().keys[kGenericDecrypt].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowDecrypt);
+        htonl(wvoec::kControlAllowDecrypt);
     oec_util_session_.license().keys[kGenericSign].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowSign);
+        htonl(wvoec::kControlAllowSign);
     oec_util_session_.license().keys[kGenericVerify].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowVerify);
+        htonl(wvoec::kControlAllowVerify);
 
     oec_util_session_.license().keys[kGenericSign].key_data_length =
         wvcdm::MAC_KEY_SIZE;
@@ -387,10 +387,10 @@ class WvGenericOperationsDataTest : public WvGenericOperationsTest {
     ASSERT_NO_FATAL_FAILURE(
         oec_util_session_.FillSimpleMessage(duration, control, nonce, pst));
     oec_util_session_.license().keys[kGenericEncrypt].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowEncrypt |
-              wvoec_mock::kControlAllowDecrypt);
+        htonl(wvoec::kControlAllowEncrypt |
+              wvoec::kControlAllowDecrypt);
     oec_util_session_.license().keys[kGenericSign].control.control_bits |=
-        htonl(wvoec_mock::kControlAllowSign | wvoec_mock::kControlAllowVerify);
+        htonl(wvoec::kControlAllowSign | wvoec::kControlAllowVerify);
 
     oec_util_session_.license().keys[kGenericSign].key_data_length =
         wvcdm::MAC_KEY_SIZE;

libwvdrmengine/cdm/core/test/http_socket.h

@@ -12,7 +12,7 @@
 #include <gtest/gtest_prod.h>
 #include <openssl/ssl.h>
 
-#include "wv_cdm_types.h"  // CORE_DISALLOW_COPY_AND_ASSIGN
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/test/license_request.h

@@ -6,7 +6,7 @@
 #define CDM_TEST_LICENSE_REQUEST_H_
 
 #include <string>
-#include "wv_cdm_types.h"
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/test/url_request.h

@@ -6,8 +6,8 @@
 #define CDM_TEST_URL_REQUEST_H_
 
 #include <string>
+#include "disallow_copy_and_assign.h"
 #include "http_socket.h"
-#include "wv_cdm_types.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/include/timer.h

@@ -7,7 +7,9 @@
 #ifndef CDM_BASE_TIMER_H_
 #define CDM_BASE_TIMER_H_
 
-#include "wv_cdm_types.h"
+#include <stdint.h>
+
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/include/wv_content_decryption_module.h

@@ -11,6 +11,7 @@
 #include <utils/RefBase.h>
 
 #include "cdm_identifier.h"
+#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "lock.h"
 #include "metrics.pb.h"

libwvdrmengine/cdm/test/unit-test.mk

@@ -23,6 +23,7 @@ LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/core/test \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/cdm/metrics/include \
+    vendor/widevine/libwvdrmengine/cdm/util/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_C_INCLUDES += external/protobuf/src

libwvdrmengine/cdm/util/include/clock.h

@@ -1,11 +1,9 @@
-// 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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Clock - Platform independent interface for a time library
 //
-#ifndef WVCDM_CORE_CLOCK_H_
-#define WVCDM_CORE_CLOCK_H_
+#ifndef WVCDM_UTIL_CLOCK_H_
+#define WVCDM_UTIL_CLOCK_H_
 
 #include <stdint.h>
 
@@ -23,4 +21,4 @@ class Clock {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_CLOCK_H_
+#endif  // WVCDM_UTIL_CLOCK_H_

libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h

@@ -0,0 +1,15 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+
+#ifndef WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
+#define WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
+
+namespace wvcdm {
+
+#define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&);                    \
+  void operator=(const TypeName&)
+
+
+}  // namespace wvcdm
+
+#endif  //  WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_

libwvdrmengine/cdm/util/include/file_store.h

@@ -1,17 +1,15 @@
-// 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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 //
 // File - Platform independent interface for a File class
 //
-#ifndef WVCDM_CORE_FILE_STORE_H_
-#define WVCDM_CORE_FILE_STORE_H_
+#ifndef WVCDM_UTIL_FILE_STORE_H_
+#define WVCDM_UTIL_FILE_STORE_H_
 
 #include <unistd.h>
 #include <string>
 #include <vector>
 
-#include "wv_cdm_types.h"
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 
@@ -79,4 +77,4 @@ class FileSystem {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_FILE_STORE_H_
+#endif  // WVCDM_UTIL_FILE_STORE_H_

libwvdrmengine/cdm/util/include/lock.h

@@ -1,13 +1,11 @@
-// 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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Lock - Platform independent interface for a Mutex class
 //
-#ifndef WVCDM_CORE_LOCK_H_
-#define WVCDM_CORE_LOCK_H_
+#ifndef WVCDM_UTIL_LOCK_H_
+#define WVCDM_UTIL_LOCK_H_
 
-#include "wv_cdm_types.h"
+#include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
 
@@ -50,4 +48,4 @@ class AutoLock {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_LOCK_H_
+#endif  // WVCDM_UTIL_LOCK_H_

libwvdrmengine/cdm/util/include/log.h

@@ -1,11 +1,9 @@
-// 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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Log - Platform independent interface for a Logging class
 //
-#ifndef WVCDM_CORE_LOG_H_
-#define WVCDM_CORE_LOG_H_
+#ifndef WVCDM_UTIL_LOG_H_
+#define WVCDM_UTIL_LOG_H_
 
 namespace wvcdm {
 
@@ -31,6 +29,7 @@ void Log(const char* file, const char* function, int line, LogPriority level,
          const char* fmt, ...);
 
 // Log APIs
+#ifndef LOGE
 #define LOGE(...) Log(__FILE__, __func__, __LINE__, \
                       wvcdm::LOG_ERROR, __VA_ARGS__)
 #define LOGW(...) Log(__FILE__, __func__, __LINE__, \
@@ -41,6 +40,7 @@ void Log(const char* file, const char* function, int line, LogPriority level,
                       wvcdm::LOG_DEBUG, __VA_ARGS__)
 #define LOGV(...) Log(__FILE__, __func__, __LINE__, \
                       wvcdm::LOG_VERBOSE, __VA_ARGS__)
+#endif
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_LOG_H_
+#endif  // WVCDM_UTIL_LOG_H_

libwvdrmengine/cdm/util/include/string_conversions.h

@@ -1,9 +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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 
-#ifndef WVCDM_CORE_STRING_CONVERSIONS_H_
-#define WVCDM_CORE_STRING_CONVERSIONS_H_
+#ifndef WVCDM_UTIL_STRING_CONVERSIONS_H_
+#define WVCDM_UTIL_STRING_CONVERSIONS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -29,4 +27,4 @@ inline int64_t ntohll64(int64_t x) { return htonll64(x); }
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_STRING_CONVERSIONS_H_
+#endif  // WVCDM_UTIL_STRING_CONVERSIONS_H_

libwvdrmengine/cdm/util/src/string_conversions.cpp

@@ -1,6 +1,4 @@
-// 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.
+// Copyright 2013 Google Inc. All Rights Reserved.
 
 #include "string_conversions.h"