Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad

am: 555d7cdc83

Change-Id: Ib3c97a96e8482fafc888d71780daa047cc6428ac

libwvdrmengine/cdm/core/src/policy_engine.cpp

@@ -40,7 +40,7 @@ PolicyEngine::PolicyEngine(CdmSessionId session_id,
       last_recorded_current_time_(0),
       session_id_(session_id),
       event_listener_(event_listener),
-      license_keys_(new LicenseKeys),
+      license_keys_(new LicenseKeys(crypto_session->GetSecurityLevel())),
       clock_(new Clock) {
   InitDevice(crypto_session);
 }
@@ -309,30 +309,8 @@ CdmResponseType PolicyEngine::QueryKeyAllowedUsage(
   return KEY_NOT_FOUND_1;
 }
 
-bool PolicyEngine::CanUseKeyForSecurityLevel(
-    const KeyId& key_id,
-    CdmSecurityLevel security_level) {
-
-  if (security_level == kSecurityLevelL1) return true;
-
-  CdmKeyAllowedUsage key_usage;
-  CdmResponseType status = QueryKeyAllowedUsage(key_id, &key_usage);
-
-  if (status != NO_ERROR) return false;
-
-  // L1 has already been addressed so verify that L2/3 are allowed
-  switch (key_usage.key_security_level_) {
-    case kKeySecurityLevelUnset:
-      return true;
-    case kSoftwareSecureCrypto:
-    case kSoftwareSecureDecode:
-      return security_level == kSecurityLevelL2 ||
-          security_level == kSecurityLevelL3;
-    case kHardwareSecureCrypto:
-      return security_level == kSecurityLevelL2;
-    default:
-      return false;
-  }
+bool PolicyEngine::CanUseKeyForSecurityLevel(const KeyId& key_id) {
+  return license_keys_->MeetsSecurityLevelConstraints(key_id);
 }
 
 bool PolicyEngine::GetSecondsSinceStarted(int64_t* seconds_since_started) {
@@ -523,4 +501,8 @@ int64_t PolicyEngine::GetCurrentTime() {
 
 void PolicyEngine::set_clock(Clock* clock) { clock_.reset(clock); }
 
+void PolicyEngine::SetSecurityLevelForTest(CdmSecurityLevel security_level) {
+  license_keys_->SetSecurityLevelForTest(security_level);
+}
+
 }  // namespace wvcdm