Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lua 5.1 5.2 support, compiler warning fixes #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Lua 5.1 5.2 support, compiler warning fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae8ac8c
Support lua 5.1, 5.2 and more recent 64-bit library locations
nyetwurk Feb 1, 2017
fa801e9
Fix compiler warning: remove unused variable
nyetwurk Feb 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions builders/cmake/cmake_find_modules/Find_lua.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ FIND_PATH(LUA_INCLUDE_PATH_
lualib.h
PATHS
/usr/include
/usr/include/lua5.1
/usr/include/lua5.2
/usr/local/include
/usr/local/include/lua51
/sw/include
Expand All @@ -13,9 +15,12 @@ FIND_PATH(LUA_INCLUDE_PATH_
FIND_LIBRARY(LUA_LIBRARY_PATH_
NAMES
lua
lua5.1
lua5.2
PATHS
/usr/lib64
/usr/lib
/usr/lib/x86_64-linux-gnu
/usr/local/lib64
/usr/local/lib
/usr/local/lib64/lua51
Expand Down
4 changes: 2 additions & 2 deletions sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ bool InboundAESProtocol::SignalInputData(IOBuffer &buffer) {
_totalDecrypted += decryptedSize;

//6. Decrypt leftovers
bool transferCompleted = false;
//bool transferCompleted = false;
if (((HTTPBufferProtocol *) GetFarProtocol())->TransferCompleted()) {
transferCompleted = true;
//transferCompleted = true;
EVP_DecryptFinal_ex(&_decContex,
pTempData + decryptedSize,
&decryptedFinalSize);
Expand Down