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

Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e

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

Change-Id: I52f0a38cf00d477c7b3937fc50fb881cad57573c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2023-03-31 23:40:17 +00:00
committed by Automerger Merge Worker
parent 58513d031e fc365ed31e
commit ae71d6ecd0
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,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_;
FileSystem* file_system_; FileSystem* file_system_;
Clock clock_; Clock clock_;
std::string spoid_; std::string spoid_;

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

@@ -74,7 +74,6 @@ class UsagePropertySet : public CdmClientPropertySet {
CdmEngine::CdmEngine(FileSystem* file_system, CdmEngine::CdmEngine(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_(),
@@ -909,6 +908,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()));
@@ -936,6 +936,7 @@ CdmResponseType CdmEngine::HandleProvisioningResponse(
SecurityLevel requested_security_level, std::string* cert, SecurityLevel requested_security_level, std::string* cert,
std::string* wrapped_key) { std::string* wrapped_key) {
LOGI("Handling provision request"); LOGI("Handling provision request");
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();

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

@@ -1041,11 +1041,10 @@ CdmResponseType CdmSession::RemoveKeys() {
} }
CdmResponseType CdmSession::RemoveLicense() { CdmResponseType CdmSession::RemoveLicense() {
CdmResponseType sts = NO_ERROR;
if (is_offline_ || has_provider_session_token()) { if (is_offline_ || has_provider_session_token()) {
if (usage_support_type_ == kUsageEntrySupport && if (usage_support_type_ == kUsageEntrySupport &&
has_provider_session_token()) { has_provider_session_token()) {
sts = DeleteUsageEntry(usage_entry_number_); DeleteUsageEntry(usage_entry_number_);
} }
DeleteLicenseFile(); DeleteLicenseFile();
} }