From 5064731d0277408caccfc99a155a86d18d56cf69 Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Fri, 23 Feb 2018 10:12:45 -0800 Subject: [PATCH] Remove call to DeriveKeys for release Merge of http://go/wvgerrit/45520/ Bug: b/70650789 Test: request_license_tests and GTS tests on sailfish and taimen This is related to b/70650789. An extra call to DeriveKeysFromSessionKey in the case where there is a provider session token results in the OEMCrypto mock incorrectly using the derived mac keys to sign the release message, since a future call to LoadKeys is never called. --- libwvdrmengine/cdm/core/src/license.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp index 18e5d729..70997f4a 100644 --- a/libwvdrmengine/cdm/core/src/license.cpp +++ b/libwvdrmengine/cdm/core/src/license.cpp @@ -951,11 +951,7 @@ bool CdmLicense::RestoreLicenseForRelease( return false; } - if (license.id().has_provider_session_token()) { - if (!crypto_session_->GenerateDerivedKeys(key_request_, - signed_response.session_key())) - return false; - } else { + if (!license.id().has_provider_session_token()) { return KEY_ADDED == HandleKeyResponse(license_response); }