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

Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046

Change-Id: Ib245efb17abbb864219f006fd008ef2bd9c526f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2023-03-30 17:34:20 +00:00
committed by Automerger Merge Worker
parent 4247f72e79 a54e3a924e
commit 300491060f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,8 @@ class CdmEngine {
CdmSessionMap session_map_; CdmSessionMap session_map_;
CdmReleaseKeySetMap release_key_sets_; CdmReleaseKeySetMap release_key_sets_;
std::unique_ptr<CertificateProvisioning> cert_provisioning_; std::unique_ptr<CertificateProvisioning> cert_provisioning_;
// Lock must be acquired before using |cert_provisioning_|.
std::mutex cert_provisioning_mutex_;
wvutil::FileSystem* file_system_; wvutil::FileSystem* file_system_;
wvutil::Clock clock_; wvutil::Clock clock_;
std::string spoid_; std::string spoid_;

3
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -65,7 +65,6 @@ class UsagePropertySet : public CdmClientPropertySet {
CdmEngine::CdmEngine(wvutil::FileSystem* file_system, CdmEngine::CdmEngine(wvutil::FileSystem* file_system,
std::shared_ptr<metrics::EngineMetrics> metrics) std::shared_ptr<metrics::EngineMetrics> metrics)
: metrics_(metrics), : metrics_(metrics),
cert_provisioning_(),
file_system_(file_system), file_system_(file_system),
spoid_(EMPTY_SPOID), spoid_(EMPTY_SPOID),
usage_session_(), usage_session_(),
@@ -1064,6 +1063,7 @@ CdmResponseType CdmEngine::GetProvisioningRequest(
} }
// TODO(b/141705730): Remove usage entries on provisioning. // TODO(b/141705730): Remove usage entries on provisioning.
std::unique_lock<std::mutex> cert_lock(cert_provisioning_mutex_);
if (!cert_provisioning_) { if (!cert_provisioning_) {
cert_provisioning_.reset( cert_provisioning_.reset(
new CertificateProvisioning(metrics_->GetCryptoMetrics())); new CertificateProvisioning(metrics_->GetCryptoMetrics()));
@@ -1093,6 +1093,7 @@ CdmResponseType CdmEngine::HandleProvisioningResponse(
std::string* wrapped_key) { std::string* wrapped_key) {
LOGI("response_size = %zu, security_level = %s", response.size(), LOGI("response_size = %zu, security_level = %s", response.size(),
RequestedSecurityLevelToString(requested_security_level)); RequestedSecurityLevelToString(requested_security_level));
std::unique_lock<std::mutex> cert_lock(cert_provisioning_mutex_);
if (response.empty()) { if (response.empty()) {
LOGE("Empty provisioning response"); LOGE("Empty provisioning response");
cert_provisioning_.reset(); cert_provisioning_.reset();