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

Report When Decrypt Is Attempted With No Key Loaded

Browse Source 
This merges change 43c7fda (Do Not Obscure wvcdm::NEED_KEY) from the
Widevine repository.  After this change, decrypt calls will return
ERROR_DRM_NO_LICENSE if the CDM returns NEED_KEY.

Bug: 10157154
Change-Id: I97b3a3990abeebb620ee4925fabf5c4261d968c4
This commit is contained in:
John "Juce" Bruce
2013-08-08 14:56:49 -07:00
parent e3ed6194fe
commit ba66224ef4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp
View File

@@ -153,7 +153,8 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
ALOGE("Decrypt error result in session %s during unencrypted block: %d", ALOGE("Decrypt error result in session %s during unencrypted block: %d",
mSessionId.c_str(), res); mSessionId.c_str(), res);
errorDetailMsg->setTo("Error decrypting data."); errorDetailMsg->setTo("Error decrypting data.");
if (res == wvcdm::INSUFFICIENT_CRYPTO_RESOURCES) { if (res == wvcdm::INSUFFICIENT_CRYPTO_RESOURCES ||
res == wvcdm::NEED_KEY) {
// This error is actionable by the app and should be passed up. // This error is actionable by the app and should be passed up.
return mapCdmResponseType(res); return mapCdmResponseType(res);
} else { } else {
@@ -181,7 +182,8 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
ALOGE("Decrypt error result in session %s during encrypted block: %d", ALOGE("Decrypt error result in session %s during encrypted block: %d",
mSessionId.c_str(), res); mSessionId.c_str(), res);
errorDetailMsg->setTo("Error decrypting data."); errorDetailMsg->setTo("Error decrypting data.");
if (res == wvcdm::INSUFFICIENT_CRYPTO_RESOURCES) { if (res == wvcdm::INSUFFICIENT_CRYPTO_RESOURCES ||
res == wvcdm::NEED_KEY) {
// This error is actionable by the app and should be passed up. // This error is actionable by the app and should be passed up.
return mapCdmResponseType(res); return mapCdmResponseType(res);
} else { } else {