From 7f16e103e6e76405be50f2264825725410eec6b9 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Fri, 19 May 2023 13:49:22 -0700 Subject: [PATCH] Sony Patch to LicenseKeys::GetAllowedUsage() Merged from http://go/wvgerrit/175350. Sony has identified a 5-year-old copy-and-paste error in LicenseKeys::GetAllowedUsage(). For entitled keys, it was calling CanDecryptContent() instead of GetAllowedUsage() on the entitlement key session. This meant that for entitled keys, the allowed_usage parameter was never updated and the return value of the function was indicating something different than intended. Bug: 280902715 Test: build_and_run_all_unit_tests Change-Id: Ic1db01b6dce08d444572f53157ff08b337c48d31 --- libwvdrmengine/cdm/core/src/license_key_status.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/license_key_status.cpp b/libwvdrmengine/cdm/core/src/license_key_status.cpp index 4e3bff28..b24dfc7e 100644 --- a/libwvdrmengine/cdm/core/src/license_key_status.cpp +++ b/libwvdrmengine/cdm/core/src/license_key_status.cpp @@ -130,7 +130,7 @@ bool LicenseKeys::GetAllowedUsage(const KeyId& key_id, } else if (content_keyid_to_entitlement_key_id_.count(key_id) > 0) { if (key_statuses_.count(content_keyid_to_entitlement_key_id_[key_id]) > 0) { return key_statuses_[content_keyid_to_entitlement_key_id_[key_id]] - ->CanDecryptContent(); + ->GetAllowedUsage(allowed_usage); } return false; } else {