Allow a service certificate to be specified for provisioning

[ Merge of http://go/wvgerrit/48400 ]

Client identification information has recently been enabled in
provisioning messages. For privacy concerns this information
is being encrypted with a default service certificate.
Apps need to be able to override the default one to allow
for provisioning with third party provisioning services.

Bug: 78420508
Test: WV unit, integration tests
      New WvCdmRequestLicenseTest.ProvisioningTestWithServiceCertificate test
      GTS MediaDrmTestCases

Change-Id: Iee61ad47d33ce011efbea4eb90f7e4b1f032d15f

libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp

@@ -596,8 +596,8 @@ Return<Status> WVDrmPlugin::restoreKeys(const hidl_vec<uint8_t>& sessionId,
   std::string cdmCertAuthority = certificateAuthority;
 
   CdmResponseType res = mCDM->GetProvisioningRequest(
-      cdmCertType, cdmCertAuthority, identifier, &cdmProvisionRequest,
-      &cdmDefaultUrl);
+      cdmCertType, cdmCertAuthority, identifier,
+      mProvisioningServiceCertificate, &cdmProvisionRequest, &cdmDefaultUrl);
   if (isCdmResponseTypeSuccess(res)) {
     request = StrToVector(cdmProvisionRequest);
     defaultUrl.clear();
@@ -996,6 +996,8 @@ Return<void> WVDrmPlugin::getPropertyByteArray(
     }
   } else if (name == "serviceCertificate") {
     value = StrToVector(mPropertySet.service_certificate());
+  } else if (name == "provisioningServiceCertificate") {
+    value = StrToVector(mProvisioningServiceCertificate);
   } else if (name == "metrics") {
     drm_metrics::WvCdmMetrics metrics;
     // If the cdm identifier is not yet sealed, then there are no metrics
@@ -1126,6 +1128,13 @@ Return<Status> WVDrmPlugin::setPropertyByteArray(
     } else {
       return Status::BAD_VALUE;
     }
+  } else if (name == "provisioningServiceCertificate") {
+    std::string cert(_value.begin(), _value.end());
+    if (_value.empty() || mCDM->IsValidServiceCertificate(cert)) {
+      mProvisioningServiceCertificate = cert;
+    } else {
+      return Status::BAD_VALUE;
+    }
   } else {
     ALOGE("App set unknown byte array property %s", name.c_str());
     return Status::ERROR_DRM_CANNOT_HANDLE;