Source release 16.2.0

core/include/certificate_provisioning.h

@@ -48,6 +48,21 @@ class CertificateProvisioning {
       FileSystem* file_system, const CdmProvisioningResponse& response,
       std::string* cert, std::string* wrapped_key);
 
+  bool supports_core_messages() const { return supports_core_messages_; }
+
+  // Helper methods
+
+  // Extract serial number and system ID from a DRM Device certificate.
+  // Either |serial_number| or |system_id| may be null, but not both.
+  static bool ExtractDeviceInfo(const std::string& device_certificate,
+                                std::string* serial_number,
+                                uint32_t* system_id);
+
+  // Removes json wrapping if applicable to extract the
+  // SignedProvisioningMessage
+  static bool ExtractAndDecodeSignedMessageForTesting(
+      const std::string& provisioning_response, std::string* result);
+
  private:
   CdmResponseType SetSpoidParameter(
       const std::string& origin, const std::string& spoid,
@@ -60,6 +75,13 @@ class CertificateProvisioning {
   CdmCertificateType cert_type_;
   std::unique_ptr<ServiceCertificate> service_certificate_;
 
+  // Indicates whether OEMCrypto supports core messages, and whether the
+  // CDM should expect a core message in the response.  This is primarily
+  // used to distinguish between v16+ OEMCrypto or an earlier version.
+  // Assume core messages are supported, and check if OEMCrypto populates
+  // the core message field when calling PrepAndSignProvisioningRequest().
+  bool supports_core_messages_ = true;
+
   CORE_DISALLOW_COPY_AND_ASSIGN(CertificateProvisioning);
 };