Source release 18.5.0

core/include/certificate_provisioning.h

@@ -73,6 +73,9 @@ class CertificateProvisioning {
   static void GetProvisioningServerUrl(std::string* default_url);
 
  private:
+#if defined(UNIT_TEST)
+  friend class CertificateProvisioningTest;
+#endif
   CdmResponseType GetProvisioningRequestInternal(
       wvutil::FileSystem* file_system,
       RequestedSecurityLevel requested_security_level,
@@ -82,7 +85,8 @@ class CertificateProvisioning {
   CdmResponseType GetProvisioning40RequestInternal(
       wvutil::FileSystem* file_system, const std::string& origin,
       const std::string& spoid, CdmProvisioningRequest* request,
-      std::string* default_url);
+      std::string* default_url, CdmCertificateType cert_type,
+      const std::string& cert_authority);
   CdmResponseType FillEncryptedClientId(
       const std::string& client_token,
       video_widevine::ProvisioningRequest& provisioning_request,
@@ -93,7 +97,14 @@ class CertificateProvisioning {
       video_widevine::ProvisioningRequest& provisioning_request,
       const ServiceCertificate& service_certificate);
   CdmResponseType HandleProvisioning40Response(
-      wvutil::FileSystem* file_system, const std::string& response_message);
+      wvutil::FileSystem* file_system,
+      const video_widevine::SignedProvisioningMessage& signed_message,
+      std::string* cert, std::string* wrapped_key);
+  // Assign the cert type for provisioning request
+  // Required by Cast cert provisioning flow
+  CdmResponseType CertTypeAssign(
+      video_widevine::ProvisioningRequest& provisioning_request,
+      CdmCertificateType cert_type, const std::string& cert_authority);
 
   CdmResponseType SetSpoidParameter(
       const std::string& origin, const std::string& spoid,
@@ -120,6 +131,8 @@ class CertificateProvisioning {
   std::string provisioning_40_wrapped_private_key_;
   // Key type of the generated key pair in provisioning 4.
   CryptoWrappedKey::Type provisioning_40_key_type_;
+  // Store the last provisioning request message
+  std::string provisioning_request_message_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CertificateProvisioning);
 };