From 7b262e1d025f44d85db5e7ccf86a170387a81ccc Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Thu, 26 Mar 2015 15:02:02 -0700 Subject: [PATCH] Alphabetize & Googleize Header Inclusions (This is a merge of http://go/wvgerrit/13761 from the Widevine repository.) This cleans up our includes to be in Google Style Guide order and in alphabetic order, for the parts of the code that are expected to follow Google Style. This also converts places in our code that were including C headers in the C++ style (i.e. instead of ) to use C style instead. This is because, although it was not causing problems for us yet, on Android these actually include different headers. ( is provided by libcxx, while is provided by Bionic) Lastly, this change puts all headers that do not come from within our project in instead of "quotes," which was not being done consistently. This change is explicitly NOT trying to standardize the spacing of our header includes. I have tried to respect, in each file, the spacing style already present. Change-Id: If3dc06532ab9b68010285d64518ef21dce3d6354 --- .../core/include/cdm_client_property_set.h | 2 +- .../cdm/core/include/crypto_session.h | 2 +- libwvdrmengine/cdm/core/include/file_store.h | 4 ++-- libwvdrmengine/cdm/core/include/properties.h | 2 +- .../cdm/core/include/wv_cdm_types.h | 2 +- libwvdrmengine/cdm/core/src/cdm_session.cpp | 2 +- .../cdm/core/src/crypto_session.cpp | 2 +- libwvdrmengine/cdm/core/src/device_files.cpp | 18 +++++++-------- libwvdrmengine/cdm/core/src/license.cpp | 2 +- .../core/src/oemcrypto_adapter_dynamic.cpp | 2 +- .../cdm/core/src/string_conversions.cpp | 7 +++--- libwvdrmengine/cdm/core/test/base64_test.cpp | 3 ++- .../cdm/core/test/cdm_engine_test.cpp | 3 ++- .../cdm/core/test/cdm_session_unittest.cpp | 4 ++-- .../cdm/core/test/device_files_unittest.cpp | 4 ++-- .../cdm/core/test/file_store_unittest.cpp | 2 +- .../cdm/core/test/http_socket_test.cpp | 4 ++-- .../test/initialization_data_unittest.cpp | 4 ++-- .../cdm/core/test/license_unittest.cpp | 7 +++--- .../cdm/core/test/max_res_engine_unittest.cpp | 4 ++-- libwvdrmengine/cdm/core/test/mock_clock.h | 4 ++-- .../cdm/core/test/policy_engine_unittest.cpp | 5 ++-- .../cdm/core/test/timer_unittest.cpp | 2 +- libwvdrmengine/cdm/src/file_store.cpp | 2 +- libwvdrmengine/cdm/src/lock.cpp | 2 +- libwvdrmengine/cdm/src/log.cpp | 2 +- libwvdrmengine/cdm/src/properties_android.cpp | 5 ++-- libwvdrmengine/cdm/src/timer.cpp | 11 +++++---- libwvdrmengine/oemcrypto/include/level3.h | 4 ++-- .../oemcrypto/include/oemcrypto_logging.h | 6 ++--- .../mock/src/oemcrypto_engine_mock.cpp | 23 ++++++++++--------- .../mock/src/oemcrypto_engine_mock.h | 6 ++--- .../oemcrypto/mock/src/oemcrypto_key_mock.cpp | 2 +- .../mock/src/oemcrypto_keybox_mock.cpp | 4 ++-- .../oemcrypto/mock/src/oemcrypto_mock.cpp | 14 +++++------ .../mock/src/oemcrypto_usage_table_mock.cpp | 15 ++++++------ .../oemcrypto/test/oemcrypto_test.cpp | 21 +++++++++-------- 37 files changed, 109 insertions(+), 99 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/cdm_client_property_set.h b/libwvdrmengine/cdm/core/include/cdm_client_property_set.h index ab995359..74d7421e 100644 --- a/libwvdrmengine/cdm/core/include/cdm_client_property_set.h +++ b/libwvdrmengine/cdm/core/include/cdm_client_property_set.h @@ -3,9 +3,9 @@ #ifndef WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_ #define WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_ +#include #include #include -#include namespace wvcdm { diff --git a/libwvdrmengine/cdm/core/include/crypto_session.h b/libwvdrmengine/cdm/core/include/crypto_session.h index d30bcdb0..13698492 100644 --- a/libwvdrmengine/cdm/core/include/crypto_session.h +++ b/libwvdrmengine/cdm/core/include/crypto_session.h @@ -3,8 +3,8 @@ #ifndef WVCDM_CORE_CRYPTO_SESSSION_H_ #define WVCDM_CORE_CRYPTO_SESSSION_H_ -#include #include +#include #include "lock.h" #include "oemcrypto_adapter.h" diff --git a/libwvdrmengine/cdm/core/include/file_store.h b/libwvdrmengine/cdm/core/include/file_store.h index c205ee46..6d75f66c 100644 --- a/libwvdrmengine/cdm/core/include/file_store.h +++ b/libwvdrmengine/cdm/core/include/file_store.h @@ -5,11 +5,11 @@ #ifndef WVCDM_CORE_FILE_STORE_H_ #define WVCDM_CORE_FILE_STORE_H_ -#include "wv_cdm_types.h" - #include #include +#include "wv_cdm_types.h" + namespace wvcdm { // File class. The implementation is platform dependent. diff --git a/libwvdrmengine/cdm/core/include/properties.h b/libwvdrmengine/cdm/core/include/properties.h index 1eb7fb14..f618f209 100644 --- a/libwvdrmengine/cdm/core/include/properties.h +++ b/libwvdrmengine/cdm/core/include/properties.h @@ -12,7 +12,7 @@ #include "wv_cdm_types.h" #if defined(UNIT_TEST) -# include "gtest/gtest_prod.h" +# include #endif namespace wvcdm { diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h index daf97151..e7e78d01 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h @@ -3,8 +3,8 @@ #ifndef WVCDM_CORE_WV_CDM_TYPES_H_ #define WVCDM_CORE_WV_CDM_TYPES_H_ -#include #include +#include #include #include diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp index 016e7a97..bdf3b700 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp @@ -2,9 +2,9 @@ #include "cdm_session.h" +#include #include #include -#include #include "cdm_engine.h" #include "clock.h" diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index 831e53f7..3843b8a5 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -6,8 +6,8 @@ #include "crypto_session.h" #include // needed for ntoh() -#include #include +#include #include "crypto_key.h" #include "log.h" diff --git a/libwvdrmengine/cdm/core/src/device_files.cpp b/libwvdrmengine/cdm/core/src/device_files.cpp index 1342cb41..cf549274 100644 --- a/libwvdrmengine/cdm/core/src/device_files.cpp +++ b/libwvdrmengine/cdm/core/src/device_files.cpp @@ -2,6 +2,15 @@ #include "device_files.h" +#include +#include + +#include "device_files.pb.h" +#include "file_store.h" +#include "log.h" +#include "properties.h" +#include "string_conversions.h" + #if defined(__APPLE__) #include #define SHA256 CC_SHA256 @@ -11,15 +20,6 @@ #include #endif -#include -#include - -#include "device_files.pb.h" -#include "file_store.h" -#include "log.h" -#include "properties.h" -#include "string_conversions.h" - // Protobuf generated classes. using video_widevine_client::sdk::DeviceCertificate; using video_widevine_client::sdk::HashedFile; diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp index 157e805a..6a70cad0 100644 --- a/libwvdrmengine/cdm/core/src/license.cpp +++ b/libwvdrmengine/cdm/core/src/license.cpp @@ -12,8 +12,8 @@ #include "device_files.h" #include "log.h" #include "policy_engine.h" -#include "properties.h" #include "privacy_crypto.h" +#include "properties.h" #include "string_conversions.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 3ccfaab8..1c14e22e 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -11,8 +11,8 @@ #include #include +#include -#include #include #include #include diff --git a/libwvdrmengine/cdm/core/src/string_conversions.cpp b/libwvdrmengine/cdm/core/src/string_conversions.cpp index d7eb805a..39541ff6 100644 --- a/libwvdrmengine/cdm/core/src/string_conversions.cpp +++ b/libwvdrmengine/cdm/core/src/string_conversions.cpp @@ -4,14 +4,15 @@ #include #include -#include -#include #include +#include #include +#include #include +#include + #include "log.h" -#include "modp_b64w.h" namespace wvcdm { diff --git a/libwvdrmengine/cdm/core/test/base64_test.cpp b/libwvdrmengine/cdm/core/test/base64_test.cpp index 4f0dc73d..0724726c 100644 --- a/libwvdrmengine/cdm/core/test/base64_test.cpp +++ b/libwvdrmengine/cdm/core/test/base64_test.cpp @@ -2,7 +2,8 @@ #include -#include "gtest/gtest.h" +#include + #include "log.h" #include "string_conversions.h" diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp index 0ba413e1..d07d363b 100644 --- a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp @@ -9,9 +9,10 @@ #include +#include + #include "cdm_engine.h" #include "config_test_env.h" -#include "gtest/gtest.h" #include "initialization_data.h" #include "license_request.h" #include "log.h" diff --git a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp index 675feb50..e74e6363 100644 --- a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp @@ -1,9 +1,9 @@ // Copyright 2014 Google Inc. All Rights Reserved. +#include +#include #include "cdm_session.h" #include "crypto_key.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "properties.h" #include "scoped_ptr.h" #include "string_conversions.h" diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp index a21d7c51..c8ea7f9b 100644 --- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp @@ -1,9 +1,9 @@ // Copyright 2013 Google Inc. All Rights Reserved. +#include +#include #include "device_files.h" #include "file_store.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "properties.h" #include "string_conversions.h" #include "wv_cdm_types.h" diff --git a/libwvdrmengine/cdm/core/test/file_store_unittest.cpp b/libwvdrmengine/cdm/core/test/file_store_unittest.cpp index 8697d21e..ff2cfe3b 100644 --- a/libwvdrmengine/cdm/core/test/file_store_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/file_store_unittest.cpp @@ -1,8 +1,8 @@ // Copyright 2013 Google Inc. All Rights Reserved. +#include #include "device_files.h" #include "file_store.h" -#include "gtest/gtest.h" #include "properties.h" #include "test_vectors.h" diff --git a/libwvdrmengine/cdm/core/test/http_socket_test.cpp b/libwvdrmengine/cdm/core/test/http_socket_test.cpp index 4dfb4b09..68a7ca82 100644 --- a/libwvdrmengine/cdm/core/test/http_socket_test.cpp +++ b/libwvdrmengine/cdm/core/test/http_socket_test.cpp @@ -1,10 +1,10 @@ // Copyright 2013 Google Inc. All Rights Reserved. #include -#include "gtest/gtest.h" +#include #include "http_socket.h" -#include "scoped_ptr.h" #include "log.h" +#include "scoped_ptr.h" #include "string_conversions.h" #include "url_request.h" diff --git a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp index e54078ee..766d7b3f 100644 --- a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp @@ -1,7 +1,7 @@ // Copyright 2015 Google Inc. All Rights Reserved. -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include +#include #include "initialization_data.h" #include "string_conversions.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/cdm/core/test/license_unittest.cpp b/libwvdrmengine/cdm/core/test/license_unittest.cpp index b10e6a8d..43c5cbbf 100644 --- a/libwvdrmengine/cdm/core/test/license_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/license_unittest.cpp @@ -1,11 +1,12 @@ // Copyright 2012 Google Inc. All Rights Reserved. +#include +#include + #include "clock.h" #include "crypto_session.h" -#include "license.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "initialization_data.h" +#include "license.h" #include "policy_engine.h" #include "properties.h" #include "string_conversions.h" diff --git a/libwvdrmengine/cdm/core/test/max_res_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/max_res_engine_unittest.cpp index baf90d35..d5d0e2bd 100644 --- a/libwvdrmengine/cdm/core/test/max_res_engine_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/max_res_engine_unittest.cpp @@ -1,8 +1,8 @@ // Copyright 2012 Google Inc. All Rights Reserved. +#include +#include #include "crypto_session.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "license.h" #include "max_res_engine.h" #include "mock_clock.h" diff --git a/libwvdrmengine/cdm/core/test/mock_clock.h b/libwvdrmengine/cdm/core/test/mock_clock.h index 6aabbe90..2579e53c 100644 --- a/libwvdrmengine/cdm/core/test/mock_clock.h +++ b/libwvdrmengine/cdm/core/test/mock_clock.h @@ -4,7 +4,7 @@ #define CDM_TEST_MOCK_CLOCK_H_ #include "clock.h" -#include "gmock/gmock.h" +#include namespace wvcdm { @@ -15,4 +15,4 @@ class MockClock : public Clock { } // wvcdm -#endif // CDM_TEST_MOCK_CLOCK_H_ \ No newline at end of file +#endif // CDM_TEST_MOCK_CLOCK_H_ diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp index 73282dee..799527ee 100644 --- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp @@ -5,8 +5,9 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include +#include + #include "license.h" #include "mock_clock.h" #include "policy_engine.h" diff --git a/libwvdrmengine/cdm/core/test/timer_unittest.cpp b/libwvdrmengine/cdm/core/test/timer_unittest.cpp index 9a2940d1..bc01ed27 100644 --- a/libwvdrmengine/cdm/core/test/timer_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/timer_unittest.cpp @@ -1,6 +1,6 @@ // Copyright 2013 Google Inc. All Rights Reserved. -#include "gtest/gtest.h" +#include #include "timer.h" namespace wvcdm { diff --git a/libwvdrmengine/cdm/src/file_store.cpp b/libwvdrmengine/cdm/src/file_store.cpp index 8b47dd5e..131ebe5e 100644 --- a/libwvdrmengine/cdm/src/file_store.cpp +++ b/libwvdrmengine/cdm/src/file_store.cpp @@ -7,10 +7,10 @@ #include #include #include +#include #include #include #include -#include #include #include "log.h" diff --git a/libwvdrmengine/cdm/src/lock.cpp b/libwvdrmengine/cdm/src/lock.cpp index 12c4da64..99f17f58 100644 --- a/libwvdrmengine/cdm/src/lock.cpp +++ b/libwvdrmengine/cdm/src/lock.cpp @@ -3,7 +3,7 @@ // Lock class - provides a simple android specific mutex implementation #include "lock.h" -#include "utils/Mutex.h" +#include namespace wvcdm { diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp index 2267ca70..ca45838e 100644 --- a/libwvdrmengine/cdm/src/log.cpp +++ b/libwvdrmengine/cdm/src/log.cpp @@ -20,7 +20,7 @@ #define LOG_BUF_SIZE 1024 #include "log.h" -#include "utils/Log.h" +#include namespace wvcdm { diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index 323f8e44..b91df4d8 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -2,11 +2,12 @@ #include "properties.h" +#include #include #include -#include -#include "cutils/properties.h" +#include + #include "log.h" namespace { diff --git a/libwvdrmengine/cdm/src/timer.cpp b/libwvdrmengine/cdm/src/timer.cpp index fd5f146e..891cf370 100644 --- a/libwvdrmengine/cdm/src/timer.cpp +++ b/libwvdrmengine/cdm/src/timer.cpp @@ -2,13 +2,14 @@ // // Timer class - provides a simple Android specific timer implementation +#include "timer.h" + #include -#include "timer.h" -#include "utils/RefBase.h" -#include "utils/StrongPointer.h" -#include "utils/Thread.h" -#include "utils/Mutex.h" +#include +#include +#include +#include namespace wvcdm { diff --git a/libwvdrmengine/oemcrypto/include/level3.h b/libwvdrmengine/oemcrypto/include/level3.h index 0560c8b7..37e8bc8f 100644 --- a/libwvdrmengine/oemcrypto/include/level3.h +++ b/libwvdrmengine/oemcrypto/include/level3.h @@ -9,8 +9,8 @@ #ifndef LEVEL3_OEMCRYPTO_H_ #define LEVEL3_OEMCRYPTO_H_ -#include -#include +#include +#include #include "OEMCryptoCENC.h" diff --git a/libwvdrmengine/oemcrypto/include/oemcrypto_logging.h b/libwvdrmengine/oemcrypto/include/oemcrypto_logging.h index 93af8fb9..ec09e6aa 100644 --- a/libwvdrmengine/oemcrypto/include/oemcrypto_logging.h +++ b/libwvdrmengine/oemcrypto/include/oemcrypto_logging.h @@ -3,11 +3,11 @@ #ifndef WVOEC_OEMCRYPTO_LOGGING_H_ #define WVOEC_OEMCRYPTO_LOGGING_H_ -#include "OEMCryptoCENC.h" +#include +#include #include "log.h" -#include -#include +#include "OEMCryptoCENC.h" namespace wvoec_mock { diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp index d59a7405..3f9a7208 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp @@ -5,24 +5,25 @@ #include "oemcrypto_engine_mock.h" #include +#include #include #include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "log.h" #include "oemcrypto_key_mock.h" #include "oemcrypto_logging.h" #include "oemcrypto_usage_table_mock.h" -#include "openssl/aes.h" -#include "openssl/bio.h" -#include "openssl/cmac.h" -#include "openssl/err.h" -#include "openssl/evp.h" -#include "openssl/hmac.h" -#include "openssl/rand.h" -#include -#include "openssl/sha.h" -#include "openssl/x509.h" #include "string_conversions.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h index cad08487..86f824ba 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h @@ -5,18 +5,18 @@ #ifndef OEMCRYPTO_ENGINE_MOCK_H_ #define OEMCRYPTO_ENGINE_MOCK_H_ -#include #include #include #include #include +#include + #include "lock.h" #include "oemcrypto_key_mock.h" #include "oemcrypto_keybox_mock.h" -#include "wv_cdm_types.h" - #include "OEMCryptoCENC.h" // Needed for enum OEMCrypto_Algorithm. +#include "wv_cdm_types.h" namespace wvoec_mock { diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp index 133d4bd8..452adfc6 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp @@ -4,7 +4,7 @@ // #include "oemcrypto_key_mock.h" -#include +#include #include #include "log.h" diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp index 748a48a0..52ab15c9 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp @@ -5,9 +5,9 @@ #include "oemcrypto_keybox_mock.h" #include // needed for ntoh() -#include -#include +#include #include +#include #include "log.h" #include "wvcrc32.h" #include "wv_keybox.h" diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp index 935d9398..4c3486d8 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp @@ -4,21 +4,21 @@ // #include "OEMCryptoCENC.h" -#include -#include #include +#include #include +#include #include #include +#include +#include +#include +#include +#include #include "log.h" #include "oemcrypto_engine_mock.h" #include "oemcrypto_logging.h" #include "oemcrypto_usage_table_mock.h" -#include "openssl/cmac.h" -#include "openssl/evp.h" -#include "openssl/hmac.h" -#include "openssl/rand.h" -#include "openssl/sha.h" #include "string_conversions.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp index bdda9075..3376af67 100644 --- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp +++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp @@ -4,20 +4,21 @@ // #include "oemcrypto_usage_table_mock.h" -#include +#include #include #include +#include +#include +#include +#include + #include "clock.h" -#include "log.h" #include "file_store.h" -#include "properties.h" +#include "log.h" #include "oemcrypto_engine_mock.h" #include "oemcrypto_logging.h" -#include "openssl/aes.h" -#include "openssl/rand.h" -#include "openssl/sha.h" -#include "openssl/hmac.h" +#include "properties.h" #include "string_conversions.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index 7db9a048..79d5816e 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -5,6 +5,16 @@ #include // needed for ntoh() #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -14,19 +24,10 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "log.h" -#include "OEMCryptoCENC.h" #include "oemcrypto_key_mock.h" +#include "OEMCryptoCENC.h" #include "properties.h" #include "string_conversions.h" #include "wv_cdm_constants.h"