widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8151064 from 6112060529 to tm-release

Browse Source 
Change-Id: I950acaefd18025bfb31c874559302f09f4c397a7
This commit is contained in:
Android Build Coastguard Worker
2022-02-05 04:20:13 +00:00
parent c4cd4a60ed 6112060529
commit 284ac8595d
11 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/device_files.h
View File

@@ -17,7 +17,7 @@
#include "wv_cdm_types.h" #include "wv_cdm_types.h"
#if defined(UNIT_TEST) #if defined(UNIT_TEST)
#include <gtest/gtest_prod.h> # include <gtest/gtest_prod.h>
#endif #endif
namespace wvutil { namespace wvutil {

2
libwvdrmengine/cdm/core/include/usage_table_header.h
View File

@@ -19,7 +19,7 @@
#include "wv_cdm_types.h" #include "wv_cdm_types.h"
#if defined(UNIT_TEST) #if defined(UNIT_TEST)
#include <gtest/gtest_prod.h> # include <gtest/gtest_prod.h>
#endif #endif
namespace wvcdm { namespace wvcdm {

3
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -833,7 +833,8 @@ const char* CdmOfflineLicenseStateToString(
CdmOfflineLicenseState license_state); CdmOfflineLicenseState license_state);
const char* CdmSecurityLevelToString(CdmSecurityLevel security_level); const char* CdmSecurityLevelToString(CdmSecurityLevel security_level);
const char* CdmUsageEntryStorageTypeToString(CdmUsageEntryStorageType type); const char* CdmUsageEntryStorageTypeToString(CdmUsageEntryStorageType type);
const char* RequestedSecurityLevelToString(RequestedSecurityLevel security_level); const char* RequestedSecurityLevelToString(
RequestedSecurityLevel security_level);
// Converts a generic, unknown enum value to a string representation // Converts a generic, unknown enum value to a string representation
// containing its numeric value. // containing its numeric value.
// The pointer returned from this function is thread_local. // The pointer returned from this function is thread_local.

6
libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
View File

@@ -173,7 +173,8 @@ CertificateProvisioning::GetProvisioningType() {
* Returns NO_ERROR for success and CERT_PROVISIONING_REQUEST_ERROR_? if fails. * Returns NO_ERROR for success and CERT_PROVISIONING_REQUEST_ERROR_? if fails.
*/ */
CdmResponseType CertificateProvisioning::GetProvisioningRequest( CdmResponseType CertificateProvisioning::GetProvisioningRequest(
wvutil::FileSystem* file_system, RequestedSecurityLevel requested_security_level, wvutil::FileSystem* file_system,
RequestedSecurityLevel requested_security_level,
CdmCertificateType cert_type, const std::string& cert_authority, CdmCertificateType cert_type, const std::string& cert_authority,
const std::string& origin, const std::string& spoid, const std::string& origin, const std::string& spoid,
CdmProvisioningRequest* request, std::string* default_url) { CdmProvisioningRequest* request, std::string* default_url) {
@@ -183,7 +184,8 @@ CdmResponseType CertificateProvisioning::GetProvisioningRequest(
} }
CdmResponseType CertificateProvisioning::GetProvisioningRequestInternal( CdmResponseType CertificateProvisioning::GetProvisioningRequestInternal(
wvutil::FileSystem* file_system, RequestedSecurityLevel requested_security_level, wvutil::FileSystem* file_system,
RequestedSecurityLevel requested_security_level,
CdmCertificateType cert_type, const std::string& cert_authority, CdmCertificateType cert_type, const std::string& cert_authority,
const std::string& origin, const std::string& spoid, const std::string& origin, const std::string& spoid,
CdmProvisioningRequest* request, std::string* default_url) { CdmProvisioningRequest* request, std::string* default_url) {

7
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -1670,7 +1670,8 @@ uint8_t OEMCrypto_Security_Patch_Level(wvcdm::RequestedSecurityLevel level) {
return fcn->SecurityPatchLevel(); return fcn->SecurityPatchLevel();
} }
OEMCrypto_Security_Level OEMCrypto_SecurityLevel(wvcdm::RequestedSecurityLevel level) { OEMCrypto_Security_Level OEMCrypto_SecurityLevel(
wvcdm::RequestedSecurityLevel level) {
if (!gAdapter) return OEMCrypto_Level_Unknown; if (!gAdapter) return OEMCrypto_Level_Unknown;
const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level); const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level);
if (!fcn) return OEMCrypto_Level_Unknown; if (!fcn) return OEMCrypto_Level_Unknown;
@@ -1726,8 +1727,8 @@ uint32_t OEMCrypto_GetAnalogOutputFlags(wvcdm::RequestedSecurityLevel level) {
return fcn->GetAnalogOutputFlags(); return fcn->GetAnalogOutputFlags();
} }
OEMCryptoResult OEMCrypto_BuildInformation(char* buffer, size_t* buffer_length, OEMCryptoResult OEMCrypto_BuildInformation(
wvcdm::RequestedSecurityLevel level) { char* buffer, size_t* buffer_length, wvcdm::RequestedSecurityLevel level) {
if (!gAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE; if (!gAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE;
const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level); const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level);
if (!fcn) return OEMCrypto_ERROR_INVALID_SESSION; if (!fcn) return OEMCrypto_ERROR_INVALID_SESSION;

7
libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp
View File

@@ -85,11 +85,12 @@ class MockCdmEngineImpl : public CdmEngine {
(const CdmSessionId&, CdmQueryMap*), (override)); (const CdmSessionId&, CdmQueryMap*), (override));
MOCK_METHOD(CdmResponseType, GetProvisioningRequest, MOCK_METHOD(CdmResponseType, GetProvisioningRequest,
(CdmCertificateType, const std::string&, const std::string&, (CdmCertificateType, const std::string&, const std::string&,
wvcdm::RequestedSecurityLevel, CdmProvisioningRequest*, std::string*), wvcdm::RequestedSecurityLevel, CdmProvisioningRequest*,
std::string*),
(override)); (override));
MOCK_METHOD(CdmResponseType, HandleProvisioningResponse, MOCK_METHOD(CdmResponseType, HandleProvisioningResponse,
(const CdmProvisioningResponse&, wvcdm::RequestedSecurityLevel, std::string*, (const CdmProvisioningResponse&, wvcdm::RequestedSecurityLevel,
std::string*), std::string*, std::string*),
(override)); (override));
MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel), (override)); MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, ListUsageIds, MOCK_METHOD(CdmResponseType, ListUsageIds,

3
libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
View File

@@ -147,7 +147,8 @@ class MockCryptoSession : public TestCryptoSession {
MOCK_METHOD(CdmClientTokenType, GetPreProvisionTokenType, (), (override)); MOCK_METHOD(CdmClientTokenType, GetPreProvisionTokenType, (), (override));
MOCK_METHOD(CdmSecurityLevel, GetSecurityLevel, (), (override)); MOCK_METHOD(CdmSecurityLevel, GetSecurityLevel, (), (override));
MOCK_METHOD(CdmResponseType, Open, (), (override)); MOCK_METHOD(CdmResponseType, Open, (), (override));
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override)); MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
(override));
MOCK_METHOD(CdmResponseType, LoadCertificatePrivateKey, MOCK_METHOD(CdmResponseType, LoadCertificatePrivateKey,
(const CryptoWrappedKey&), (override)); (const CryptoWrappedKey&), (override));
MOCK_METHOD(bool, HasUsageInfoSupport, (bool*), (override)); MOCK_METHOD(bool, HasUsageInfoSupport, (bool*), (override));

12
libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
View File

@@ -59,14 +59,18 @@ class MockCryptoSession : public TestCryptoSession {
public: public:
MockCryptoSession(metrics::CryptoMetrics* metrics) MockCryptoSession(metrics::CryptoMetrics* metrics)
: TestCryptoSession(metrics) {} : TestCryptoSession(metrics) {}
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override)); MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
(override));
// Usage Table Header. // Usage Table Header.
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader, MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override)); (wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*),
(override));
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader, MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override)); (wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&),
(override));
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader, MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override)); (wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*),
(override));
// Usage Entry. // Usage Entry.
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override)); MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&), MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),

12
libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
View File

@@ -434,14 +434,18 @@ class MockCryptoSession : public TestCryptoSession {
public: public:
MockCryptoSession(metrics::CryptoMetrics* metrics) MockCryptoSession(metrics::CryptoMetrics* metrics)
: TestCryptoSession(metrics) {} : TestCryptoSession(metrics) {}
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override)); MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel),
(override));
// Usage Table Header. // Usage Table Header.
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader, MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override)); (wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*),
(override));
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader, MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override)); (wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&),
(override));
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader, MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override)); (wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*),
(override));
// Usage Entry. // Usage Entry.
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override)); MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&), MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),

14
libwvdrmengine/cdm/util/src/log.cpp
View File

@@ -11,11 +11,11 @@
* at the top of your source file) to change that behavior. * at the top of your source file) to change that behavior.
*/ */
#ifndef LOG_NDEBUG #ifndef LOG_NDEBUG
#ifdef NDEBUG # ifdef NDEBUG
#define LOG_NDEBUG 1 # define LOG_NDEBUG 1
#else # else
#define LOG_NDEBUG 0 # define LOG_NDEBUG 0
#endif # endif
#endif #endif
#define LOG_TAG "WVCdm" #define LOG_TAG "WVCdm"
@@ -24,9 +24,9 @@
#include "log.h" #include "log.h"
#ifdef IS_HIDL #ifdef IS_HIDL
#include <hwbinder/IPCThreadState.h> # include <hwbinder/IPCThreadState.h>
#else // AIDL is the default #else // AIDL is the default
#include <binder/IPCThreadState.h> # include <binder/IPCThreadState.h>
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>

10
tests/Android.mk
View File

@@ -14,10 +14,12 @@ WIDEVINE_TEST_MAKE_TARGETS += \
base64_test \ base64_test \
buffer_reader_test \ buffer_reader_test \
cdm_coverage_test \ cdm_coverage_test \
cdm_engine_metrics_decorator_unittest \
cdm_engine_test \ cdm_engine_test \
cdm_extended_duration_test \ cdm_extended_duration_test \
cdm_feature_test \ cdm_feature_test \
cdm_session_unittest \ cdm_session_unittest \
certificate_provisioning_unittest \
counter_metric_unittest \ counter_metric_unittest \
crypto_session_unittest \ crypto_session_unittest \
device_files_unittest \ device_files_unittest \
@@ -25,18 +27,26 @@ WIDEVINE_TEST_MAKE_TARGETS += \
event_metric_unittest \ event_metric_unittest \
file_store_unittest \ file_store_unittest \
file_utils_unittest \ file_utils_unittest \
generic_crypto_unittest \
hidl_metrics_adapter_unittest \
http_socket_test \ http_socket_test \
initialization_data_unittest \ initialization_data_unittest \
keybox_ota_test \
libwvdrmdrmplugin_hidl_test \ libwvdrmdrmplugin_hidl_test \
libwvdrmengine_hidl_test \ libwvdrmengine_hidl_test \
libwvdrmmediacrypto_hidl_test \ libwvdrmmediacrypto_hidl_test \
license_keys_unittest \ license_keys_unittest \
license_unittest \ license_unittest \
metrics_collections_unittest \
odk_test \ odk_test \
oemcrypto_test \ oemcrypto_test \
okp_fallback_policy_test \
ota_keybox_provisioner_test \
policy_engine_constraints_unittest \ policy_engine_constraints_unittest \
policy_engine_unittest \ policy_engine_unittest \
policy_integration_test \
request_license_test \ request_license_test \
rw_lock_test \
service_certificate_unittest \ service_certificate_unittest \
timer_unittest \ timer_unittest \
usage_table_header_unittest \ usage_table_header_unittest \