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.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user