Changes from Widevine CDM repo

Squashed commit of these CLs from the widevine cdm repo: Update YT CP server URI to point to the UAT server https://widevine-internal-review.googlesource.com/#/c/9327/ OEMCrypto Version 9 API https://widevine-internal-review.googlesource.com/#/c/9142/ Correct Device ID length in OEMCrypto reference version https://widevine-internal-review.googlesource.com/#/c/8723/ Modify tests to prevent intermittent failures https://widevine-internal-review.googlesource.com/#/c/8982/ Generate a unique license request ID https://widevine-internal-review.googlesource.com/#/c/8721/ Re-enable android timer mechanisms https://widevine-internal-review.googlesource.com/#/c/8833/ Do not close CDM session on removeKeys https://widevine-internal-review.googlesource.com/#/c/8703/ And numerous changes required by Eureka, Steel, and CTE versions of Widevine CDM, as highlighted here: https://widevine-internal-review.googlesource.com/#/c/8596/ https://widevine-internal-review.googlesource.com/#/c/8955/ https://widevine-internal-review.googlesource.com/#/c/8922/ https://widevine-internal-review.googlesource.com/#/c/8890/ https://widevine-internal-review.googlesource.com/#/c/8871/ https://widevine-internal-review.googlesource.com/#/c/8706/ https://widevine-internal-review.googlesource.com/#/c/8425/ Change-Id: Iafd33905227e74eb2132c240b929d2282ab68042
2014-03-14 15:00:22 -07:00
parent 7e8bea7d8d
commit dd75655102
45 changed files with 856 additions and 711 deletions
--- a/libwvdrmengine/cdm/core/include/cdm_engine.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine.h
@@ -5,7 +5,6 @@

 #include "certificate_provisioning.h"
 #include "oemcrypto_adapter.h"
-#include "timer.h"
 #include "wv_cdm_types.h"

 namespace wvcdm {
@@ -18,121 +17,114 @@ class WvCdmEventListener;
 typedef std::map<CdmSessionId, CdmSession*> CdmSessionMap;
 typedef std::map<CdmKeySetId, CdmSessionId> CdmReleaseKeySetMap;

-class CdmEngine : public TimerHandler {
+class CdmEngine {
 public:
  CdmEngine();
  virtual ~CdmEngine();

  // Session related methods
-  virtual CdmResponseType OpenSession(
-      const CdmKeySystem& key_system,
-      const CdmClientPropertySet* property_set,
-      CdmSessionId* session_id);
-  virtual CdmResponseType CloseSession(const CdmSessionId& session_id);
+  CdmResponseType OpenSession(const CdmKeySystem& key_system,
+                              const CdmClientPropertySet* property_set,
+                              CdmSessionId* session_id);
+  CdmResponseType CloseSession(const CdmSessionId& session_id);

-  virtual CdmResponseType OpenKeySetSession(const CdmKeySetId& key_set_id);
-  virtual CdmResponseType CloseKeySetSession(const CdmKeySetId& key_set_id);
+  CdmResponseType OpenKeySetSession(const CdmKeySetId& key_set_id);
+  CdmResponseType CloseKeySetSession(const CdmKeySetId& key_set_id);

  // License related methods
  // Construct a valid license request
-  virtual CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
-                                             const CdmKeySetId& key_set_id,
-                                             const CdmInitData& init_data,
-                                             const CdmLicenseType license_type,
-                                             CdmAppParameterMap& app_parameters,
-                                             CdmKeyMessage* key_request,
-                                             std::string* server_url);
+  CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
+                                     const CdmKeySetId& key_set_id,
+                                     const CdmInitData& init_data,
+                                     const CdmLicenseType license_type,
+                                     CdmAppParameterMap& app_parameters,
+                                     CdmKeyMessage* key_request,
+                                     std::string* server_url);

  // Accept license response and extract key info.
-  virtual CdmResponseType AddKey(const CdmSessionId& session_id,
-                                 const CdmKeyResponse& key_data,
-                                 CdmKeySetId* key_set_id);
+  CdmResponseType AddKey(const CdmSessionId& session_id,
+                         const CdmKeyResponse& key_data,
+                         CdmKeySetId* key_set_id);

-  virtual CdmResponseType RestoreKey(const CdmSessionId& session_id,
-                                     const CdmKeySetId& key_set_id);
+  CdmResponseType RestoreKey(const CdmSessionId& session_id,
+                             const CdmKeySetId& key_set_id);

  CdmResponseType CancelKeyRequest(const CdmSessionId& session_id);

  // Construct valid renewal request for the current session keys.
-  virtual CdmResponseType GenerateRenewalRequest(const CdmSessionId& session_id,
-                                                 CdmKeyMessage* key_request,
-                                                 std::string* server_url);
+  CdmResponseType GenerateRenewalRequest(const CdmSessionId& session_id,
+                                         CdmKeyMessage* key_request,
+                                         std::string* server_url);

  // Accept renewal response and update key info.
-  virtual CdmResponseType RenewKey(const CdmSessionId& session_id,
-                                   const CdmKeyResponse& key_data);
+  CdmResponseType RenewKey(const CdmSessionId& session_id,
+                           const CdmKeyResponse& key_data);

  // Query system information
-  virtual CdmResponseType QueryStatus(CdmQueryMap* info);
+  CdmResponseType QueryStatus(CdmQueryMap* info);

  // Query session information
  virtual CdmResponseType QuerySessionStatus(const CdmSessionId& session_id,
                                             CdmQueryMap* key_info);

  // Query license information
-  virtual CdmResponseType QueryKeyStatus(const CdmSessionId& session_id,
-                                         CdmQueryMap* key_info);
+  CdmResponseType QueryKeyStatus(const CdmSessionId& session_id,
+                                 CdmQueryMap* key_info);

  // Query seesion control information
-  virtual CdmResponseType QueryKeyControlInfo(const CdmSessionId& session_id,
-                                              CdmQueryMap* key_info);
+  CdmResponseType QueryKeyControlInfo(const CdmSessionId& session_id,
+                                      CdmQueryMap* key_info);

  // Provisioning related methods
-  virtual CdmResponseType GetProvisioningRequest(
-      CdmProvisioningRequest* request,
-      std::string* default_url);
+  CdmResponseType GetProvisioningRequest(CdmProvisioningRequest* request,
+                                         std::string* default_url);

-  virtual CdmResponseType HandleProvisioningResponse(
-      CdmProvisioningResponse& response);
+  CdmResponseType HandleProvisioningResponse(CdmProvisioningResponse& response);

  // Secure stop related methods
-  virtual CdmResponseType GetSecureStops(CdmSecureStops* secure_stops);
-  virtual CdmResponseType ReleaseSecureStops(
+  CdmResponseType GetSecureStops(CdmSecureStops* secure_stops);
+  CdmResponseType ReleaseSecureStops(
      const CdmSecureStopReleaseMessage& message);

  // Decryption and key related methods
  // Accept encrypted buffer and return decrypted data.
-  virtual CdmResponseType Decrypt(const CdmSessionId& session_id,
-                                  const CdmDecryptionParameters& parameters);
+  CdmResponseType Decrypt(const CdmSessionId& session_id,
+                          const CdmDecryptionParameters& parameters);
+
+  size_t SessionSize() const { return sessions_.size(); }

  // Is the key known to any session?
-  virtual bool IsKeyValid(const KeyId& key_id);
-  virtual bool FindSessionForKey(const KeyId& key_id, CdmSessionId* sessionId);
+  bool IsKeyLoaded(const KeyId& key_id);
+  bool FindSessionForKey(const KeyId& key_id, CdmSessionId* sessionId);

  // Event listener related methods
-  virtual bool AttachEventListener(const CdmSessionId& session_id,
-                                   WvCdmEventListener* listener);
-  virtual bool DetachEventListener(const CdmSessionId& session_id,
-                                   WvCdmEventListener* listener);
+  bool AttachEventListener(const CdmSessionId& session_id,
+                           WvCdmEventListener* listener);
+  bool DetachEventListener(const CdmSessionId& session_id,
+                           WvCdmEventListener* listener);

  // Parse a blob of multiple concatenated PSSH atoms to extract the first
  // widevine pssh
  static bool ExtractWidevinePssh(const CdmInitData& init_data,
                                  CdmInitData* output);

+  // Timer expiration method
+  void OnTimerEvent();
+
 private:
  // private methods
  // Cancel all sessions
-  virtual bool CancelSessions();
-  virtual bool ValidateKeySystem(const CdmKeySystem& key_system);
+  bool CancelSessions();
+  bool ValidateKeySystem(const CdmKeySystem& key_system);

-  // timer related methods to drive policy decisions
-  virtual void EnablePolicyTimer();
-  virtual void DisablePolicyTimer(bool force);
-  virtual void OnTimerEvent();
-
-  virtual void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
+  void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);

  // instance variables
  CdmSessionMap sessions_;
  CdmReleaseKeySetMap release_key_sets_;
-
  CertificateProvisioning cert_provisioning_;
  SecurityLevel cert_provisioning_requested_security_level_;

-  // policy timer
-  Timer policy_timer_;
-
  CORE_DISALLOW_COPY_AND_ASSIGN(CdmEngine);
 };

--- a/libwvdrmengine/cdm/core/include/cdm_session.h
+++ b/libwvdrmengine/cdm/core/include/cdm_session.h
@@ -79,7 +79,7 @@ class CdmSession {
  // ReleaseKey() - Accept response and release key.
  CdmResponseType ReleaseKey(const CdmKeyResponse& key_response);

-  bool IsKeyValid(const KeyId& key_id);
+  bool IsKeyLoaded(const KeyId& key_id);

  bool AttachEventListener(WvCdmEventListener* listener);
  bool DetachEventListener(WvCdmEventListener* listener);
@@ -119,8 +119,6 @@ class CdmSession {
  // license type release and offline related information
  CdmKeySetId key_set_id_;

-  KeyId key_id_;
-
  // Used for certificate based licensing
  std::string wrapped_key_;
  bool is_certificate_loaded_;
--- a/libwvdrmengine/cdm/core/include/crypto_session.h
+++ b/libwvdrmengine/cdm/core/include/crypto_session.h
@@ -63,7 +63,6 @@ class CryptoSession {
                          std::string* wrapped_rsa_key);

  // Media data path
-  bool SelectKey(const std::string& key_id);
  CdmResponseType Decrypt(const CdmDecryptionParameters& parameters);

  bool GetRandom(size_t data_length, uint8_t* random_data);
@@ -80,6 +79,8 @@ class CryptoSession {
  size_t GetOffset(std::string message, std::string field);
  bool SetDestinationBufferType();

+  bool SelectKey(const std::string& key_id);
+
  static const size_t kSignatureSize = 32;  // size for HMAC-SHA256 signature
  static Lock crypto_lock_;
  static bool initialized_;
--- a/libwvdrmengine/cdm/core/include/device_files.h
+++ b/libwvdrmengine/cdm/core/include/device_files.h
@@ -59,6 +59,9 @@ class DeviceFiles {
  bool RetrieveFile(const char* name, std::string* data);

 private:
+  // Certificate and offline licenses are now stored in security
+  // level specific directories. In an earlier version they were
+  // stored in a common directory and need to be copied over.
  virtual void SecurityLevelPathBackwardCompatibility();

  File* file_;
--- a/libwvdrmengine/cdm/core/include/file_store.h
+++ b/libwvdrmengine/cdm/core/include/file_store.h
@@ -12,6 +12,8 @@ namespace wvcdm {
 // File class. The implementation is platform dependent.
 class File {
 public:
+  class Impl;
+
  // defines as bit flag
  enum OpenFlags {
    kNoFlags = 0,
@@ -39,7 +41,6 @@ class File {
  virtual ssize_t FileSize(const std::string& file_path);

 private:
-  class Impl;
  Impl *impl_;

  CORE_DISALLOW_COPY_AND_ASSIGN(File);
--- a/libwvdrmengine/cdm/core/include/policy_engine.h
+++ b/libwvdrmengine/cdm/core/include/policy_engine.h
@@ -27,7 +27,12 @@ class PolicyEngine {
  // status is not calculated to avoid overhead in the decryption path.
  inline bool can_decrypt()         { return can_decrypt_; }

-  void OnTimerEvent(bool& event_occurred, CdmEventType& event);
+  // OnTimerEvent is called when a timer fires. It notifies the Policy Engine
+  // that the timer has fired and that it should check whether any events have
+  // occurred since the last timer event. If so, it sets event_occurred to true
+  // and sets event to point to the event that occurred. If not, it sets
+  // event_occurred to false.
+  void OnTimerEvent(bool* event_occurred, CdmEventType* event);

  // SetLicense is used in handling the initial license response. It stores
  // an exact copy of the policy information stored in the license.
--- a/libwvdrmengine/cdm/core/include/properties.h
+++ b/libwvdrmengine/cdm/core/include/properties.h
@@ -14,7 +14,7 @@
 namespace wvcdm {

 typedef std::map<CdmSessionId, const CdmClientPropertySet*>
-  CdmClientPropertySetMap;
+    CdmClientPropertySetMap;

 // This class saves information about features and properties enabled
 // for a given platform. At initialization it initializes properties from
@@ -42,9 +42,7 @@ class Properties {
  static inline bool use_certificates_as_identification() {
    return use_certificates_as_identification_;
  }
-  static inline bool extract_pssh_data() {
-    return extract_pssh_data_;
-  }
+  static inline bool extract_pssh_data() { return extract_pssh_data_; }
  static inline bool decrypt_with_empty_session_support() {
    return decrypt_with_empty_session_support_;
  }
@@ -64,13 +62,12 @@ class Properties {
  static bool GetSecurityLevelDirectories(std::vector<std::string>* dirs);
  static const std::string GetSecurityLevel(const CdmSessionId& session_id);
  static const std::vector<uint8_t> GetServiceCertificate(
-       const CdmSessionId& session_id);
+      const CdmSessionId& session_id);
  static bool UsePrivacyMode(const CdmSessionId& session_id);
  static uint32_t GetSessionSharingId(const CdmSessionId& session_id);

-  static bool AddSessionPropertySet(
-      const CdmSessionId& session_id,
-      const CdmClientPropertySet* property_set);
+  static bool AddSessionPropertySet(const CdmSessionId& session_id,
+                                    const CdmClientPropertySet* property_set);
  static bool RemoveSessionPropertySet(const CdmSessionId& session_id);

 private:
@@ -94,16 +91,17 @@ class Properties {
  static void set_use_certificates_as_identification(bool flag) {
    use_certificates_as_identification_ = flag;
  }
-  static void set_extract_pssh_data(bool flag) {
-    extract_pssh_data_ = flag;
-  }
+  static void set_extract_pssh_data(bool flag) { extract_pssh_data_ = flag; }
+
  static void set_decrypt_with_empty_session_support(bool flag) {
    decrypt_with_empty_session_support_ = flag;
  }
-  static void set_security_level_path_backward_compatibility_support(bool flag) {
+  static void set_security_level_path_backward_compatibility_support(
+      bool flag) {
    security_level_path_backward_compatibility_support_ = flag;
  }

+ private:
  static bool begin_license_usage_when_received_;
  static bool require_explicit_renew_request_;
  static bool oem_crypto_use_secure_buffers_;
--- a/libwvdrmengine/cdm/core/include/string_conversions.h
+++ b/libwvdrmengine/cdm/core/include/string_conversions.h
@@ -11,6 +11,7 @@
 namespace wvcdm {

 std::vector<uint8_t> a2b_hex(const std::string& b);
+std::vector<uint8_t> a2b_hex(const std::string& label, const std::string& b);
 std::string a2bs_hex(const std::string& b);
 std::string b2a_hex(const std::vector<uint8_t>& b);
 std::string b2a_hex(const std::string& b);
--- a/libwvdrmengine/cdm/core/include/timer.h
+++ b/libwvdrmengine/cdm/core/include/timer.h
@@ -31,6 +31,8 @@ class TimerHandler {

 class Timer {
 public:
+  class Impl;
+
  Timer();
  ~Timer();

@@ -39,7 +41,6 @@ class Timer {
  bool IsRunning();

 private:
-  class Impl;
  Impl *impl_;

  CORE_DISALLOW_COPY_AND_ASSIGN(Timer);
--- a/libwvdrmengine/cdm/core/include/wv_cdm_constants.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_constants.h
@@ -54,7 +54,7 @@ static const std::string QUERY_VALUE_OFFLINE = "Offline";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_L1 = "L1";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_L2 = "L2";
 static const std::string QUERY_VALUE_SECURITY_LEVEL_L3 = "L3";
-static const std::string QUERY_VALUE_SECURITY_LEVEL_Unknown = "Unknown";
+static const std::string QUERY_VALUE_SECURITY_LEVEL_UNKNOWN = "Unknown";

 }  // namespace wvcdm

--- a/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_event_listener.h
@@ -8,7 +8,7 @@
 namespace wvcdm {

 // Listener for events from the Content Decryption Module.
-// The caller of the CDM API must provide an implementation for onEvent
+// The caller of the CDM API must provide an implementation for OnEvent
 // and signal its intent by using the Attach/DetachEventListener methods
 // in the WvContentDecryptionModule class.
 class WvCdmEventListener {
@@ -16,7 +16,7 @@ class WvCdmEventListener {
  WvCdmEventListener() {}
  virtual ~WvCdmEventListener() {}

-  virtual void onEvent(const CdmSessionId& session_id,
+  virtual void OnEvent(const CdmSessionId& session_id,
                       CdmEventType cdm_event) = 0;

 private:
--- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h
+++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h
@@ -28,6 +28,11 @@ typedef std::vector<uint8_t> CdmSecureStopReleaseMessage;
 typedef std::string CdmProvisioningRequest;
 typedef std::string CdmProvisioningResponse;

+// Types for shared host/cdm interface pairs used to shared vendor data.
+typedef std::pair<std::string, std::string> kStringPairs;
+typedef std::vector<uint8_t> kVectorBytes;
+typedef std::pair<std::string, kVectorBytes> kVectorPairs;
+
 enum CdmResponseType {
  NO_ERROR,
  UNKNOWN_ERROR,