resolved conflicts for merge of 3db90f54 to master

Change-Id: Ie9e46292e003fefce9ca44a31cb338a0ecf51930
2014-04-01 16:32:36 -07:00
parent c3444dc9e9 3db90f54c1
commit 965cedd5ee
26 changed files with 874 additions and 49 deletions
--- a/libwvdrmengine/cdm/core/include/cdm_engine.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine.h
@@ -77,10 +77,16 @@ class CdmEngine {
                                      CdmQueryMap* key_info);

  // Provisioning related methods
-  CdmResponseType GetProvisioningRequest(CdmProvisioningRequest* request,
-                                         std::string* default_url);
+  CdmResponseType GetProvisioningRequest(
+      CdmCertificateType cert_type,
+      const std::string& cert_authority,
+      CdmProvisioningRequest* request,
+      std::string* default_url);

-  CdmResponseType HandleProvisioningResponse(CdmProvisioningResponse& response);
+  CdmResponseType HandleProvisioningResponse(
+      CdmProvisioningResponse& response,
+      std::string* cert,
+      std::string* wrapped_key);

  // Secure stop related methods
  CdmResponseType GetSecureStops(CdmSecureStops* secure_stops);