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/cdm_session.h

@@ -139,6 +139,7 @@ class CdmSession {
   bool is_release_;
   CdmSecurityLevel security_level_;
   SecurityLevel requested_security_level_;
+  CdmAppParameterMap app_parameters_;
 
   // decryption and usage flags
   bool is_initial_decryption_;

libwvdrmengine/cdm/core/include/device_files.h

@@ -51,13 +51,15 @@ class DeviceFiles {
                             const CdmKeyResponse& key_renewal_response,
                             const std::string& release_server_url,
                             int64_t playback_start_time,
-                            int64_t last_playback_time);
+                            int64_t last_playback_time,
+                            const CdmAppParameterMap& app_parameters);
   virtual bool RetrieveLicense(
       const std::string& key_set_id, LicenseState* state,
       CdmInitData* pssh_data, CdmKeyMessage* key_request,
       CdmKeyResponse* key_response, CdmKeyMessage* key_renewal_request,
       CdmKeyResponse* key_renewal_response, std::string* release_server_url,
-      int64_t* playback_start_time, int64_t* last_playback_time);
+      int64_t* playback_start_time, int64_t* last_playback_time,
+      CdmAppParameterMap* app_parameters);
   virtual bool DeleteLicense(const std::string& key_set_id);
   virtual bool DeleteAllFiles();
   virtual bool DeleteAllLicenses();
@@ -122,6 +124,7 @@ class DeviceFiles {
   FRIEND_TEST(DeviceFilesTest, DeleteLicense);
   FRIEND_TEST(DeviceFilesTest, ReserveLicenseIds);
   FRIEND_TEST(DeviceFilesTest, RetrieveLicenses);
+  FRIEND_TEST(DeviceFilesTest, AppParametersBackwardCompatibility);
   FRIEND_TEST(DeviceFilesTest, SecurityLevelPathBackwardCompatibility);
   FRIEND_TEST(DeviceFilesTest, StoreLicenses);
   FRIEND_TEST(DeviceFilesTest, UpdateLicenseState);

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_;

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -177,6 +177,14 @@ enum CdmResponseType {
   UNPROVISION_ERROR_4,
   UNSUPPORTED_INIT_DATA,
   USAGE_INFO_NOT_FOUND,
+  SERVICE_CERTIFICATE_REQUEST_GENERATE_ERROR,
+  PARSE_SERVICE_CERTIFICATE_ERROR,
+  SERVICE_CERTIFICATE_TYPE_ERROR,
+  CLIENT_ID_GENERATE_RANDOM_ERROR,
+  CLIENT_ID_AES_INIT_ERROR,
+  CLIENT_ID_AES_ENCRYPT_ERROR,
+  CLIENT_ID_RSA_INIT_ERROR,
+  CLIENT_ID_RSA_ENCRYPT_ERROR,
 };
 
 enum CdmKeyStatus {