Source release 15.3.0

core/src/cdm_engine.cpp

@@ -523,6 +523,19 @@ CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id,
   return KEY_ADDED;
 }
 
+CdmResponseType CdmEngine::SetSessionServiceCertificate(
+    const CdmSessionId& session_id, const std::string& service_certificate) {
+  LOGI("Setting service certificate: session_id = %s", session_id.c_str());
+
+  std::shared_ptr<CdmSession> session;
+  if (!session_map_.FindSession(session_id, &session)) {
+    LOGE("Session ID not found: %s", session_id.c_str());
+    return SESSION_NOT_FOUND_22;
+  }
+
+  return session->SetServiceCertificate(service_certificate);
+}
+
 CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
                                        const std::string& query_token,
                                        std::string* query_response) {

core/src/cdm_session.cpp

@@ -599,6 +599,11 @@ CdmResponseType CdmSession::QueryStatus(CdmQueryMap* query_response) {
   return NO_ERROR;
 }
 
+CdmResponseType CdmSession::SetServiceCertificate(
+    const std::string& service_certificate) {
+  return license_parser_->SetServiceCertificate(service_certificate);
+}
+
 CdmResponseType CdmSession::QueryKeyStatus(CdmQueryMap* query_response) {
   return policy_engine_->Query(query_response);
 }

core/src/license.cpp

@@ -226,16 +226,9 @@ bool CdmLicense::Init(const std::string& client_token,
     return false;
   }
 
-  if (use_privacy_mode) {
-    if (!signed_service_certificate.empty()) {
-      if (service_certificate_.Init(signed_service_certificate) != NO_ERROR)
-        return false;
-    }
-    if (!service_certificate_.has_certificate() &&
-        !Properties::allow_service_certificate_requests()) {
-      LOGE("CdmLicense::Init: Required service certificate not provided");
-      return false;
-    }
+  if (use_privacy_mode && !signed_service_certificate.empty() &&
+      service_certificate_.Init(signed_service_certificate) != NO_ERROR) {
+    return false;
   }
 
   client_token_ = client_token;
@@ -248,6 +241,11 @@ bool CdmLicense::Init(const std::string& client_token,
   return true;
 }
 
+CdmResponseType CdmLicense::SetServiceCertificate(
+    const std::string& signed_service_certificate) {
+  return service_certificate_.Init(signed_service_certificate);
+}
+
 CdmResponseType CdmLicense::PrepareKeyRequest(
     const InitializationData& init_data, CdmLicenseType license_type,
     const CdmAppParameterMap& app_parameters, CdmKeyMessage* signed_request,