Add client information to release and renewal messages

[ Merge of go/wvgerrit/14240 ]

Client information is reported in release and renewal messages based on
flag in the license. License proto has been updated to match server updates.

There are two caveats
* Client IDs will be reported unencrypted when usage reports are requested.
* Release requests that enable privacy mode (encrypted client IDs) but do not
  specify a service certificate are not supported.

b/19247020

Change-Id: I95e709922122370f310936fbad3d312262128e49

libwvdrmengine/cdm/core/include/license.h

@@ -12,6 +12,7 @@
 namespace video_widevine_server {
 namespace sdk {
 class SignedMessage;
+class LicenseRequest;
 }
 }  // namespace video_widevine_server
 
@@ -35,9 +36,10 @@ class CdmLicense {
                                  const CdmSessionId& session_id,
                                  CdmKeyMessage* signed_request,
                                  std::string* server_url);
-  virtual CdmResponseType PrepareKeyUpdateRequest(bool is_renewal,
-                                                  CdmKeyMessage* signed_request,
-                                                  std::string* server_url);
+  virtual CdmResponseType PrepareKeyUpdateRequest(
+      bool is_renewal, const CdmAppParameterMap& app_parameters,
+      const CdmSessionId& session_id, CdmKeyMessage* signed_request,
+      std::string* server_url);
   virtual CdmResponseType HandleKeyResponse(
       const CdmKeyResponse& license_response);
   virtual CdmResponseType HandleKeyUpdateResponse(
@@ -66,10 +68,17 @@ class CdmLicense {
   CdmResponseType HandleKeyErrorResponse(
       const video_widevine_server::sdk::SignedMessage& signed_message);
 
+  CdmResponseType PrepareClientId(
+      bool encrypt, const std::string& certificate,
+      const CdmAppParameterMap& app_parameters,
+      video_widevine_server::sdk::LicenseRequest* license_request);
   template <typename T>
   bool PrepareContentId(const CdmLicenseType license_type,
                         const std::string& request_id, T* content_id);
 
+  bool GetServiceCertificate(const CdmSessionId& session_id,
+                             std::string* service_certificate);
+
   CryptoSession* session_;
   PolicyEngine* policy_engine_;
   std::string server_url_;
@@ -79,6 +88,7 @@ class CdmLicense {
   bool initialized_;
   std::set<KeyId> loaded_keys_;
   std::string provider_session_token_;
+  bool renew_with_client_id_;
 
   // Used for certificate based licensing
   CdmKeyMessage key_request_;