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/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -15,10 +15,6 @@
 #include "wv_cdm_constants.h"
 #include "wv_cdm_event_listener.h"

-namespace {
-const int kCdmPolicyTimerDurationSeconds = 1;
-}
-
 namespace wvcdm {

 CdmEngine::CdmEngine()
@@ -29,7 +25,6 @@ CdmEngine::CdmEngine()
 CdmEngine::~CdmEngine() {
  CancelSessions();

-  DisablePolicyTimer(true);
  CdmSessionMap::iterator i(sessions_.begin());
  for (; i != sessions_.end(); ++i)
    delete i->second;
@@ -101,7 +96,6 @@ CdmResponseType CdmEngine::CloseSession(const CdmSessionId& session_id) {

  CdmSession* session = iter->second;
  sessions_.erase(session_id);
-  DisablePolicyTimer(false);
  delete session;
  return NO_ERROR;
 }
@@ -248,10 +242,6 @@ CdmResponseType CdmEngine::AddKey(
    return sts;
  }

-  if (!license_type_release) {
-    EnablePolicyTimer();
-  }
-
  return KEY_ADDED;
 }

@@ -286,9 +276,6 @@ CdmResponseType CdmEngine::CancelKeyRequest(const CdmSessionId& session_id) {

  //TODO(gmorgan): Issue: what is semantics of canceling a key request. Should
  //this call cancel all keys for the session?
-  // TODO(jfore): We should disable the policy timer here if there are no
-  // active sessions. Sessions are currently not being destroyed here. We can
-  // add this logic once the semantics of canceling the key is worked out.

  CdmSessionMap::iterator iter = sessions_.find(session_id);
  if (iter == sessions_.end()) {
@@ -296,8 +283,8 @@ CdmResponseType CdmEngine::CancelKeyRequest(const CdmSessionId& session_id) {
    return KEY_ERROR;
  }

-  // TODO(edwinwong, rfrias): unload keys here
-  DisablePolicyTimer(false);
+  // Re-initialize to release crypto session/keys without closing session
+  iter->second->Init();
  return NO_ERROR;
 }

@@ -372,7 +359,8 @@ CdmResponseType CdmEngine::QueryStatus(CdmQueryMap* key_info) {
      break;
    case kSecurityLevelUninitialized:
    case kSecurityLevelUnknown:
-      (*key_info)[QUERY_KEY_SECURITY_LEVEL] = QUERY_VALUE_SECURITY_LEVEL_Unknown;
+      (*key_info)[QUERY_KEY_SECURITY_LEVEL] =
+          QUERY_VALUE_SECURITY_LEVEL_UNKNOWN;
      break;
    default:
      return KEY_ERROR;
@@ -504,8 +492,13 @@ CdmResponseType CdmEngine::Decrypt(
  }

  if (parameters.decrypt_buffer == NULL) {
-    LOGE("CdmEngine::Decrypt: no dest decrypt buffer");
-    return KEY_ERROR;
+    if (!parameters.is_secure &&
+        !Properties::Properties::oem_crypto_use_fifo()) {
+      LOGE("CdmEngine::Decrypt: no dest decrypt buffer");
+      return KEY_ERROR;
+    } // else we must be level 1 direct and we don't need to return a buffer.
+    // TODO:(eschacker) look at renaming Properties::oem_crypto_use_fifo()
+    // to something like Properties::oem_crypto_use_direct_rendering().
  }

  CdmSessionMap::iterator iter;
@@ -514,7 +507,7 @@ CdmResponseType CdmEngine::Decrypt(

    // Loop through the sessions to find the session containing the key_id.
    for (iter = sessions_.begin(); iter != sessions_.end(); ++iter) {
-      if (iter->second->IsKeyValid(*parameters.key_id)) break;
+      if (iter->second->IsKeyLoaded(*parameters.key_id)) break;
    }
  } else {
    iter = sessions_.find(session_id);
@@ -527,10 +520,10 @@ CdmResponseType CdmEngine::Decrypt(
  return iter->second->Decrypt(parameters);
 }

-bool CdmEngine::IsKeyValid(const KeyId& key_id) {
+bool CdmEngine::IsKeyLoaded(const KeyId& key_id) {
  for (CdmSessionMap::iterator iter = sessions_.begin();
       iter != sessions_.end(); ++iter) {
-    if (iter->second->IsKeyValid(key_id)) {
+    if (iter->second->IsKeyLoaded(key_id)) {
      return true;
    }
  }
@@ -545,14 +538,21 @@ bool CdmEngine::FindSessionForKey(
    return false;
  }

+  CdmSessionMap::iterator iter = sessions_.find(*session_id);
+  if (iter != sessions_.end()) {
+    if (iter->second->IsKeyLoaded(key_id)) {
+      return true;
+    }
+  }
+
  uint32_t session_sharing_id = Properties::GetSessionSharingId(*session_id);

-  for (CdmSessionMap::iterator iter = sessions_.begin();
-       iter != sessions_.end(); ++iter) {
-    CdmSessionId id = iter->second->session_id();
-    if (Properties::GetSessionSharingId(id) == session_sharing_id) {
-      if (iter->second->IsKeyValid(key_id)) {
-        *session_id = id;
+  for (iter = sessions_.begin(); iter != sessions_.end(); ++iter) {
+    CdmSessionId local_session_id = iter->second->session_id();
+    if (Properties::GetSessionSharingId(local_session_id) ==
+        session_sharing_id) {
+      if (iter->second->IsKeyLoaded(key_id)) {
+        *session_id = local_session_id;
        return true;
      }
    }
@@ -684,16 +684,6 @@ bool CdmEngine::ExtractWidevinePssh(
  return false;
 }

-void CdmEngine::EnablePolicyTimer() {
-  if (!policy_timer_.IsRunning())
-    policy_timer_.Start(this, kCdmPolicyTimerDurationSeconds);
-}
-
-void CdmEngine::DisablePolicyTimer(bool force) {
-  if ((sessions_.size() == 0 || force) && policy_timer_.IsRunning())
-    policy_timer_.Stop();
-}
-
 void CdmEngine::OnTimerEvent() {
  for (CdmSessionMap::iterator iter = sessions_.begin();
       iter != sessions_.end(); ++iter) {
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -95,7 +95,10 @@ CdmResponseType CdmSession::RestoreOfflineSession(
  }

  if (Properties::use_certificates_as_identification()) {
-    if (!crypto_session_->LoadCertificatePrivateKey(wrapped_key_)) {
+    if (is_certificate_loaded_ ||
+        crypto_session_->LoadCertificatePrivateKey(wrapped_key_)) {
+      is_certificate_loaded_ = true;
+    } else {
      return NEED_PROVISIONING;
    }
  }
@@ -165,8 +168,7 @@ CdmResponseType CdmSession::GenerateKeyRequest(
      if (is_certificate_loaded_ ||
          crypto_session_->LoadCertificatePrivateKey(wrapped_key_)) {
        is_certificate_loaded_ = true;
-      }
-      else {
+      } else {
        reinitialize_session_ = true;
        return NEED_PROVISIONING;
      }
@@ -241,12 +243,12 @@ CdmResponseType CdmSession::AddKey(const CdmKeyResponse& key_response,

 CdmResponseType CdmSession::QueryStatus(CdmQueryMap* key_info) {
  if (crypto_session_.get() == NULL) {
-    LOGW("CdmSession::QueryStatus: Invalid crypto session");
+    LOGE("CdmSession::QueryStatus: Invalid crypto session");
    return UNKNOWN_ERROR;
  }

  if (!crypto_session_->IsOpen()) {
-    LOGW("CdmSession::QueryStatus: Crypto session not open");
+    LOGE("CdmSession::QueryStatus: Crypto session not open");
    return UNKNOWN_ERROR;
  }

@@ -262,7 +264,8 @@ CdmResponseType CdmSession::QueryStatus(CdmQueryMap* key_info) {
      break;
    case kSecurityLevelUninitialized:
    case kSecurityLevelUnknown:
-      (*key_info)[QUERY_KEY_SECURITY_LEVEL] = QUERY_VALUE_SECURITY_LEVEL_Unknown;
+      (*key_info)[QUERY_KEY_SECURITY_LEVEL] =
+          QUERY_VALUE_SECURITY_LEVEL_UNKNOWN;
      break;
    default:
      return KEY_ERROR;
@@ -321,8 +324,10 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
 // session keys.
 CdmResponseType CdmSession::GenerateRenewalRequest(CdmKeyMessage* key_request,
                                                   std::string* server_url) {
-  if (!license_parser_.PrepareKeyUpdateRequest(true, key_request, server_url))
+  if (!license_parser_.PrepareKeyUpdateRequest(true, key_request, server_url)) {
+    LOGE("CdmSession::GenerateRenewalRequest: ERROR on prepare");
    return KEY_ERROR;
+  }

  if (license_type_ == kLicenseTypeOffline) {
    offline_key_renewal_request_ = *key_request;
@@ -364,7 +369,7 @@ CdmResponseType CdmSession::ReleaseKey(const CdmKeyResponse& key_response) {
  return sts;
 }

-bool CdmSession::IsKeyValid(const KeyId& key_id) {
+bool CdmSession::IsKeyLoaded(const KeyId& key_id) {
  return license_parser_.IsKeyLoaded(key_id);
 }

@@ -428,12 +433,12 @@ void CdmSession::OnTimerEvent() {
  bool event_occurred = false;
  CdmEventType event;

-  policy_engine_.OnTimerEvent(event_occurred, event);
+  policy_engine_.OnTimerEvent(&event_occurred, &event);

  if (event_occurred) {
    for (CdmEventListenerIter iter = listeners_.begin();
         iter != listeners_.end(); ++iter) {
-      (*iter)->onEvent(session_id_, event);
+      (*iter)->OnEvent(session_id_, event);
    }
  }
 }
@@ -442,7 +447,7 @@ void CdmSession::OnKeyReleaseEvent(const CdmKeySetId& key_set_id) {
  if (key_set_id_ == key_set_id) {
    for (CdmEventListenerIter iter = listeners_.begin();
         iter != listeners_.end(); ++iter) {
-      (*iter)->onEvent(session_id_, LICENSE_EXPIRED_EVENT);
+      (*iter)->OnEvent(session_id_, LICENSE_EXPIRED_EVENT);
    }
  }
 }
--- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
+++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
@@ -176,11 +176,20 @@ CdmResponseType CertificateProvisioning::HandleProvisioningResponse(
    return UNKNOWN_ERROR;
  }

-  if (!signed_response.has_signature() || !signed_response.has_message()) {
-    LOGE("HandleProvisioningResponse: signature or message not found");
-    return UNKNOWN_ERROR;
+  bool error = false;
+  if (!signed_response.has_signature()) {
+    LOGE("HandleProvisioningResponse: signature not found");
+    error = true;
  }

+  if (!signed_response.has_message()) {
+    LOGE("HandleProvisioningResponse: message not found");
+    error = true;
+  }
+
+  if (error)
+      return UNKNOWN_ERROR;
+
  const std::string& signed_message = signed_response.message();
  ProvisioningResponse provisioning_response;

--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -155,10 +155,7 @@ bool CryptoSession::GetDeviceUniqueId(std::string* device_id) {
    return false;
  }

-  id.resize(id_length + 1);
-  id[id_length] = '\0';
-
-  *device_id = reinterpret_cast<const char*>(&id[0]);
+  device_id->assign(reinterpret_cast<char *>(&id[0]), id_length);
  return true;
 }

@@ -358,6 +355,8 @@ CdmResponseType CryptoSession::LoadKeys(const std::string& message,
  if (mac_key.size() >= MAC_KEY_SIZE && mac_key_iv.size() >= KEY_IV_SIZE) {
    enc_mac_key = msg + GetOffset(message, mac_key);
    enc_mac_key_iv = msg + GetOffset(message, mac_key_iv);
+  } else {
+    LOGV("CryptoSession::LoadKeys: enc_mac_key not set");
  }
  std::vector<OEMCrypto_KeyObject> load_key_array(num_keys);
  for (int i = 0; i < num_keys; ++i) {
@@ -394,7 +393,7 @@ CdmResponseType CryptoSession::LoadKeys(const std::string& message,
 }

 bool CryptoSession::LoadCertificatePrivateKey(std::string& wrapped_key) {
-  LOGV("CryptoSession::LoadKeys: Lock");
+  LOGV("CryptoSession::LoadCertificatePrivateKey: Lock");
  AutoLock auto_lock(crypto_lock_);

  LOGV("LoadDeviceRSAKey: id=%ld", (uint32_t)oec_session_id_);
@@ -566,7 +565,7 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
  AutoLock auto_lock(crypto_lock_);
  // Check if key needs to be selected
  if (params.is_encrypted) {
-    if (key_id_.compare(*params.key_id) != 0) {
+    if (key_id_ != *params.key_id) {
      if (SelectKey(*params.key_id)) {
        key_id_ = *params.key_id;
      } else {
@@ -604,7 +603,7 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {

  switch (sts) {
    case OEMCrypto_SUCCESS:
-      break;
+      return NO_ERROR;
    case OEMCrypto_ERROR_INSUFFICIENT_RESOURCES:
      return INSUFFICIENT_CRYPTO_RESOURCES;
    case OEMCrypto_ERROR_KEY_EXPIRED:
@@ -612,7 +611,6 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
    default:
      return UNKNOWN_ERROR;
  }
-  return NO_ERROR;
 }

 bool CryptoSession::GenerateNonce(uint32_t* nonce) {
--- a/libwvdrmengine/cdm/core/src/device_files.cpp
+++ b/libwvdrmengine/cdm/core/src/device_files.cpp
@@ -22,8 +22,11 @@ namespace {
 const char kCertificateFileName[] = "cert.bin";
 const char kLicenseFileNameExt[] = ".lic";
 const char kWildcard[] = "*";
-const char kPathDelimiter[] = "/";
-const char *kSecurityLevelPathCompatibilityExclusionList[] = { "ay64.dat" };
+const char kDirectoryDelimiter = '/';
+const char* kSecurityLevelPathCompatibilityExclusionList[] = {"ay64.dat"};
+size_t kSecurityLevelPathCompatibilityExclusionListSize =
+    sizeof(kSecurityLevelPathCompatibilityExclusionList) /
+    sizeof(*kSecurityLevelPathCompatibilityExclusionList);
 }  // namespace

 namespace wvcdm {
@@ -436,7 +439,6 @@ bool DeviceFiles::RetrieveFile(const char* name, std::string* data) {
  }

  if (!file_->Open(path, File::kReadOnly | File::kBinary)) {
-    LOGW("DeviceFiles::RetrieveFile: File open failed: %s", path.c_str());
    return false;
  }

@@ -457,27 +459,33 @@ bool DeviceFiles::RetrieveFile(const char* name, std::string* data) {
 void DeviceFiles::SecurityLevelPathBackwardCompatibility() {
  std::string path;
  if (!Properties::GetDeviceFilesBasePath(security_level_, &path)) {
-    LOGW("DeviceFiles::SecurityLevelPathBackwardCompatibility: Unable to "
+    LOGW(
+        "DeviceFiles::SecurityLevelPathBackwardCompatibility: Unable to "
        "get base path");
    return;
  }

  std::vector<std::string> security_dirs;
  if (!Properties::GetSecurityLevelDirectories(&security_dirs)) {
-    LOGW("DeviceFiles::SecurityLevelPathBackwardCompatibility: Unable to "
+    LOGW(
+        "DeviceFiles::SecurityLevelPathBackwardCompatibility: Unable to "
        "get security directories");
    return;
  }

  size_t pos = std::string::npos;
  for (size_t i = 0; i < security_dirs.size(); ++i) {
-    pos = path.rfind(security_dirs[i]);
-    if (std::string::npos != pos)
+    pos = path.find(security_dirs[i]);
+    if (pos != std::string::npos && pos > 0 &&
+        pos == path.size() - security_dirs[i].size() &&
+        path[pos - 1] == kDirectoryDelimiter) {
      break;
+    }
  }

  if (pos == std::string::npos) {
-    LOGV("DeviceFiles::SecurityLevelPathBackwardCompatibility: Security level "
+    LOGV(
+        "DeviceFiles::SecurityLevelPathBackwardCompatibility: Security level "
        "specific path not found. Check properties?");
    return;
  }
@@ -485,16 +493,16 @@ void DeviceFiles::SecurityLevelPathBackwardCompatibility() {
  std::string from_dir(path, 0, pos);

  std::vector<std::string> files;
-  file_->List(from_dir, &files);
+  if (!file_->List(from_dir, &files)) {
+    return;
+  }

  for (size_t i = 0; i < files.size(); ++i) {
    std::string from = from_dir + files[i];
    bool exclude = false;
-    for (size_t j = 0;
-         j < sizeof(kSecurityLevelPathCompatibilityExclusionList) /
-             sizeof(const char*);
-         j++) {
-      if (files[i].compare(kSecurityLevelPathCompatibilityExclusionList[j]) == 0) {
+    for (size_t j = 0; j < kSecurityLevelPathCompatibilityExclusionListSize;
+         ++j) {
+      if (files[i] == kSecurityLevelPathCompatibilityExclusionList[j]) {
        exclude = true;
        break;
      }
@@ -504,8 +512,7 @@ void DeviceFiles::SecurityLevelPathBackwardCompatibility() {

    for (size_t j = 0; j < security_dirs.size(); ++j) {
      std::string to_dir = from_dir + security_dirs[j];
-      if (!file_->Exists(to_dir))
-        file_->CreateDirectory(to_dir);
+      if (!file_->Exists(to_dir)) file_->CreateDirectory(to_dir);
      std::string to = to_dir + files[i];
      file_->Copy(from, to);
    }
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -90,7 +90,7 @@ typedef OEMCryptoResult (*L1_GenerateRSASignature_t)(OEMCrypto_SESSION session,
                                                     size_t message_length,
                                                     uint8_t* signature,
                                                     size_t* signature_length,
-                                                     RSA_Padding_Scheme algorithm);
+                                                     RSA_Padding_Scheme padding_scheme);
 typedef OEMCryptoResult (*L1_DeriveKeysFromSessionKey_t)(
    OEMCrypto_SESSION session, const uint8_t* enc_session_key,
    size_t enc_session_key_length, const uint8_t* mac_key_context,
@@ -318,7 +318,7 @@ class Adapter {
  }

  LevelSession get(OEMCrypto_SESSION session) {
-    AutoLock auto_lock(lookup_lock_);
+    AutoLock auto_lock(session_map_lock_);
    map_iterator pair = session_map_.find(session);
    if (pair == session_map_.end()) {
      return LevelSession();
@@ -327,7 +327,6 @@ class Adapter {
  }

  OEMCryptoResult OpenSession(OEMCrypto_SESSION* session, SecurityLevel level) {
-    AutoLock auto_lock(lookup_lock_);
    LevelSession new_session;
    OEMCryptoResult result;
    if (level == kLevelDefault && level1_valid_) {
@@ -340,6 +339,7 @@ class Adapter {
      *session = new_session.session + kLevel3Offset;
    }
    if (result == OEMCrypto_SUCCESS) {
+      AutoLock auto_lock(session_map_lock_);
      // Make sure session is not already in my list of sessions.
      while (session_map_.find(*session) != session_map_.end()) {
        (*session)++;
@@ -350,7 +350,7 @@ class Adapter {
  }

  OEMCryptoResult CloseSession(OEMCrypto_SESSION session) {
-    AutoLock auto_lock(lookup_lock_);
+    AutoLock auto_lock(session_map_lock_);
    map_iterator pair = session_map_.find(session);
    if (pair == session_map_.end()) {
      return OEMCrypto_ERROR_INVALID_SESSION;
@@ -367,7 +367,7 @@ class Adapter {
  struct FunctionPointers level1_;
  struct FunctionPointers level3_;
  std::map<OEMCrypto_SESSION, LevelSession> session_map_;
-  Lock lookup_lock_;
+  Lock session_map_lock_;
  // This is just for debugging the map between session ids.
  // If we add this to the level 3 session id, then the external session
  // id will match the internal session id in the last two digits.
@@ -583,12 +583,13 @@ extern "C" OEMCryptoResult OEMCrypto_LoadDeviceRSAKey(

 extern "C" OEMCryptoResult OEMCrypto_GenerateRSASignature(
    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
-    uint8_t* signature, size_t* signature_length, RSA_Padding_Scheme algorithm) {
+    uint8_t* signature, size_t* signature_length, RSA_Padding_Scheme padding_scheme) {
  if (!kAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE;
  LevelSession pair = kAdapter->get(session);
  if (!pair.fcn) return OEMCrypto_ERROR_INVALID_SESSION;
  return pair.fcn->GenerateRSASignature(pair.session, message, message_length,
-                                        signature, signature_length, algorithm);
+                                        signature, signature_length,
+                                        padding_scheme);
 }

 extern "C" OEMCryptoResult OEMCrypto_DeriveKeysFromSessionKey(
--- a/libwvdrmengine/cdm/core/src/policy_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/policy_engine.cpp
@@ -40,8 +40,8 @@ void PolicyEngine::Init(Clock* clock) {
  clock_ = clock;
 }

-void PolicyEngine::OnTimerEvent(bool& event_occured, CdmEventType& event) {
-  event_occured = false;
+void PolicyEngine::OnTimerEvent(bool* event_occurred, CdmEventType* event) {
+  *event_occurred = false;
  int64_t current_time = clock_->GetCurrentTime();

  // License expiration trumps all.
@@ -50,8 +50,8 @@ void PolicyEngine::OnTimerEvent(bool& event_occured, CdmEventType& event) {
      license_state_ != kLicenseStateExpired) {
    license_state_ = kLicenseStateExpired;
    can_decrypt_ = false;
-    event = LICENSE_EXPIRED_EVENT;
-    event_occured = true;
+    *event = LICENSE_EXPIRED_EVENT;
+    *event_occurred = true;
    return;
  }

@@ -91,8 +91,8 @@ void PolicyEngine::OnTimerEvent(bool& event_occured, CdmEventType& event) {

  if (renewal_needed) {
    UpdateRenewalRequest(current_time);
-    event = LICENSE_RENEWAL_NEEDED_EVENT;
-    event_occured = true;
+    *event = LICENSE_RENEWAL_NEEDED_EVENT;
+    *event_occurred = true;
  }
 }

@@ -109,6 +109,10 @@ void PolicyEngine::UpdateLicense(
  if (!license.has_policy())
    return;

+  if (kLicenseStateExpired == license_state_) {
+    LOGD("PolicyEngine::UpdateLicense: updating an expired license");
+  }
+
  policy_.MergeFrom(license.policy());

  if (!policy_.can_play()) {
--- a/libwvdrmengine/cdm/core/src/properties.cpp
+++ b/libwvdrmengine/cdm/core/src/properties.cpp
@@ -5,7 +5,7 @@
 #include "wv_cdm_constants.h"

 namespace {
-const char *kSecurityLevelDirs[] = { "L1/", "L3/" };
+const char* kSecurityLevelDirs[] = {"L1/", "L3/"};
 }  // namespace

 namespace wvcdm {
@@ -30,20 +30,20 @@ void Properties::Init() {
      kPropertyUseCertificatesAsIdentification;
  extract_pssh_data_ = kExtractPsshData;
  decrypt_with_empty_session_support_ = kDecryptWithEmptySessionSupport;
-  security_level_path_backward_compatibility_support_ = kSecurityLevelPathBackwardCompatibilitySupport;
+  security_level_path_backward_compatibility_support_ =
+      kSecurityLevelPathBackwardCompatibilitySupport;
  session_property_set_.reset(new CdmClientPropertySetMap());
 }

 bool Properties::AddSessionPropertySet(
-    const CdmSessionId& session_id,
-    const CdmClientPropertySet* property_set) {
+    const CdmSessionId& session_id, const CdmClientPropertySet* property_set) {
  if (NULL == session_property_set_.get()) {
    return false;
  }
  std::pair<CdmClientPropertySetMap::iterator, bool> result =
-    session_property_set_->insert(
-        std::pair<const CdmSessionId,
-                  const CdmClientPropertySet*>(session_id, property_set));
+      session_property_set_->insert(
+          std::pair<const CdmSessionId, const CdmClientPropertySet*>(
+              session_id, property_set));
  return result.second;
 }

@@ -55,7 +55,7 @@ bool Properties::RemoveSessionPropertySet(const CdmSessionId& session_id) {
 }

 const CdmClientPropertySet* Properties::GetCdmClientPropertySet(
-  const CdmSessionId& session_id) {
+    const CdmSessionId& session_id) {
  if (NULL != session_property_set_.get()) {
    CdmClientPropertySetMap::const_iterator it =
        session_property_set_->find(session_id);
@@ -112,7 +112,7 @@ uint32_t Properties::GetSessionSharingId(const CdmSessionId& session_id) {
 }

 bool Properties::GetSecurityLevelDirectories(std::vector<std::string>* dirs) {
-  dirs->resize(sizeof(kSecurityLevelDirs)/sizeof(const char*));
+  dirs->resize(sizeof(kSecurityLevelDirs) / sizeof(const char*));
  for (size_t i = 0; i < dirs->size(); ++i) {
    (*dirs)[i] = kSecurityLevelDirs[i];
  }
--- a/libwvdrmengine/cdm/core/src/string_conversions.cpp
+++ b/libwvdrmengine/cdm/core/src/string_conversions.cpp
@@ -50,6 +50,16 @@ std::vector<uint8_t> a2b_hex(const std::string& byte) {
  return array;
 }

+// converts an ascii hex string(2 bytes per digit) into a decimal byte string
+// dump the string with the label.
+std::vector<uint8_t> a2b_hex(const std::string& label, const std::string& byte) {
+
+  std::cout << std::endl << "[[DUMP: " << label << " ]= \"" << byte << "\"]"
+            << std::endl << std::endl;
+
+  return a2b_hex(byte);
+}
+
 std::string a2bs_hex(const std::string& byte) {
  std::vector<uint8_t> array = a2b_hex(byte);
  return std::string(array.begin(), array.end());
@@ -141,7 +151,7 @@ std::string IntToString(int value) {
  memset(buffer, 0, kOutputBufSize);
  snprintf(buffer, kOutputBufSize, "%d", value);

-  std::string out_string(buffer, sizeof(buffer));
+  std::string out_string(buffer);
  return out_string;
 }

@@ -153,7 +163,7 @@ std::string UintToString(unsigned int value) {
  memset(buffer, 0, kOutputBufSize);
  snprintf(buffer, kOutputBufSize, "%u", value);

-  std::string out_string(buffer, sizeof(buffer));
+  std::string out_string(buffer);
  return out_string;
 }