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

Don\'t Validate Crypto Mode for Unencrypted Decrypt

Browse Source 
am: 6d2822f

* commit '6d2822f6c615e957de2ad0af3fb1009e79a46fcc':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: I225cf7310cd43ac6c7cf0c6082d3220ce4bbbb9b
This commit is contained in:
John "Juce" Bruce
2016-04-27 23:18:46 +00:00
committed by android-build-merger
parent ecfd61e803 6d2822f6c6
commit 31a75673b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -678,7 +678,7 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
params.encrypt_buffer, params.encrypt_length, params.encrypt_buffer, params.encrypt_length,
&buffer_descriptor, params.subsample_flags); &buffer_descriptor, params.subsample_flags);
} }
if (params.cipher_mode != cipher_mode_) { if (params.is_encrypted && params.cipher_mode != cipher_mode_) {
return INCORRECT_CRYPTO_MODE; return INCORRECT_CRYPTO_MODE;
} }
if (params.is_encrypted || sts == OEMCrypto_ERROR_NOT_IMPLEMENTED) { if (params.is_encrypted || sts == OEMCrypto_ERROR_NOT_IMPLEMENTED) {