From d601914d57d6f3759c7ef8d561c56f3e13738e02 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Thu, 18 Apr 2013 18:23:21 -0700 Subject: [PATCH] Don't set BufferType to clear for non-encrypted buffers When non-encrypted buffers are sent to OEMCrypto_DecryptCTR, the cdm is overriding the buffer type to be non-secure. This is incorrect, the encrypted state is not the same as the buffer protection level. This change removes the special case override that should not be there. bug: 8621521 Change-Id: I705b1dc82b393305b9e6bdcb524d6b8126f58d3d --- libwvdrmengine/cdm/core/src/crypto_session.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index 66fdf985..62e87ac6 100755 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -401,9 +401,6 @@ CdmResponseType CryptoSession::Decrypt(bool is_encrypted, OEMCrypto_DestBufferDesc buffer_descriptor; buffer_descriptor.type = destination_buffer_type_; - if (!is_encrypted) - buffer_descriptor.type = OEMCrypto_BufferType_Clear; - switch (buffer_descriptor.type) { case OEMCrypto_BufferType_Clear: buffer_descriptor.buffer.clear.address =