widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Accept new signing keys for no renewal license" into lmp-mr1-dev

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2014-11-13 17:13:23 +00:00
committed by Android (Google) Code Review
parent 3b1a3e47d8 c325b3aec3
commit 9810ff8925
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libwvdrmengine/cdm/core/src/license.cpp
View File

@@ -636,16 +636,16 @@ CdmResponseType CdmLicense::HandleKeyResponse(
// Extract mac key // Extract mac key
std::string mac_key_iv; std::string mac_key_iv;
std::string mac_key; std::string mac_key;
if (license.policy().can_renew()) { for (int i = 0; i < license.key_size(); ++i) {
for (int i = 0; i < license.key_size(); ++i) { if (license.key(i).type() == License_KeyContainer::SIGNING) {
if (license.key(i).type() == License_KeyContainer::SIGNING) { mac_key_iv.assign(license.key(i).iv());
mac_key_iv.assign(license.key(i).iv());
// Strip off PKCS#5 padding // Strip off PKCS#5 padding
mac_key.assign(license.key(i).key().data(), MAC_KEY_SIZE); mac_key.assign(license.key(i).key().data(), MAC_KEY_SIZE);
}
} }
}
if (license.policy().can_renew() ||
(mac_key_iv.size() != 0 || mac_key.size() != 0)) {
if (mac_key_iv.size() != KEY_IV_SIZE || mac_key.size() != MAC_KEY_SIZE) { if (mac_key_iv.size() != KEY_IV_SIZE || mac_key.size() != MAC_KEY_SIZE) {
LOGE( LOGE(
"CdmLicense::HandleKeyResponse: mac key/iv size error" "CdmLicense::HandleKeyResponse: mac key/iv size error"