Source release 14.0.0

core/include/license.h

@@ -24,16 +24,20 @@ class PolicyEngine;
 class CdmSession;
 class CryptoKey;
 
+using ::google::protobuf::RepeatedPtrField;
+using video_widevine::License_KeyContainer;
+using video_widevine::WidevinePsshData_EntitledKey;
+
 class CdmLicense {
  public:
   CdmLicense(const CdmSessionId& session_id);
   virtual ~CdmLicense();
 
-  virtual bool Init(
-      const std::string& client_token, CdmClientTokenType client_token_type,
-      const std::string& device_id, bool use_privacy_mode,
-      const std::string& signed_service_certificate, CryptoSession* session,
-      PolicyEngine* policy_engine);
+  virtual bool Init(const std::string& client_token,
+                    CdmClientTokenType client_token_type,
+                    const std::string& device_id, bool use_privacy_mode,
+                    const std::string& signed_service_certificate,
+                    CryptoSession* session, PolicyEngine* policy_engine);
 
   virtual CdmResponseType PrepareKeyRequest(
       const InitializationData& init_data, CdmLicenseType license_type,
@@ -47,7 +51,8 @@ class CdmLicense {
       const CdmKeyResponse& license_response);
   virtual CdmResponseType HandleKeyUpdateResponse(
       bool is_renewal, const CdmKeyResponse& license_response);
-  virtual CdmResponseType HandleSubLicense(const InitializationData& init_data);
+  virtual CdmResponseType HandleEmbeddedKeyData(
+      const InitializationData& init_data);
 
   virtual bool RestoreOfflineLicense(
       const CdmKeyMessage& license_request,
@@ -64,22 +69,16 @@ class CdmLicense {
     return provider_session_token_;
   }
 
-  virtual bool is_offline() {
-    return is_offline_;
-  }
+  virtual bool is_offline() { return is_offline_; }
 
   static bool ExtractProviderSessionToken(
       const CdmKeyResponse& license_response,
       std::string* provider_session_token);
 
  private:
-
   CdmResponseType HandleKeyErrorResponse(
       const video_widevine::SignedMessage& signed_message);
 
-  bool GetClientTokenType(
-      video_widevine::ClientIdentification::TokenType* token_type);
-
   CdmResponseType PrepareClientId(
       const CdmAppParameterMap& app_parameters,
       video_widevine::LicenseRequest* license_request);
@@ -89,9 +88,28 @@ class CdmLicense {
       const std::string& request_id,
       video_widevine::LicenseRequest* license_request);
 
+  CdmResponseType HandleContentKeyResponse(
+      const std::string& msg, const std::string& signature,
+      const std::string& mac_key_iv, const std::string& mac_key,
+      const std::vector<CryptoKey>& key_array,
+      const video_widevine::License& license);
+
+  // HandleEntitlementKeyResponse loads the entitlement keys in |key_array| into
+  // the crypto session. In addition, it also extracts content keys from
+  // |wrapped_keys_| and loads them for use.
+  CdmResponseType HandleEntitlementKeyResponse(
+      const std::string& msg, const std::string& signature,
+      const std::string& mac_key_iv, const std::string& mac_key,
+      const std::vector<CryptoKey>& key_array,
+      const video_widevine::License& license);
+
+  CdmResponseType HandleNewEntitledKeys(
+      const std::vector<WidevinePsshData_EntitledKey>& wrapped_keys);
+  CdmResponseType HandleSubLicense(const InitializationData& init_data);
+
   template <typename T>
-  bool SetTypeAndId(CdmLicenseType license_type,
-                    const std::string& request_id, T* content_id);
+  bool SetTypeAndId(CdmLicenseType license_type, const std::string& request_id,
+                    T* content_id);
 
   CryptoSession* crypto_session_;
   PolicyEngine* policy_engine_;
@@ -120,10 +138,19 @@ class CdmLicense {
   // CdmLicense takes ownership of the clock.
   CdmLicense(const CdmSessionId& session_id, Clock* clock);
 
-  // For sublicense key embedding. This key array will be initilized with any
+  // For entitlement key licensing. This holds the keys from the init_data.
+  // These keys are extracted from the pssh when we generate a license request.
+  // It is used to load content keys after we have received a license and
+  // entitelement keys. It is also used in updating the key status info.
+  std::vector<WidevinePsshData_EntitledKey> wrapped_keys_;
+
+  // For sublicense key embedding. This key array will be initialized with any
   // sub session keys we may have received in a license response. These keys
   // may be used to support key rotation.
-  std::vector<CryptoKey> sub_session_key_array_;
+  std::vector<CryptoKey> entitlement_key_array_;
+
+  CdmLicenseKeyType license_key_type_;
+  RepeatedPtrField<License_KeyContainer> entitlement_keys_;
 #if defined(UNIT_TEST)
   friend class CdmLicenseTest;
 #endif