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

[pull] master from dscharrer:master #6

Merged
merged 4 commits into from
Dec 31, 2024
Merged

[pull] master from dscharrer:master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
345b5cb
slice: Fix use of undefined BOOST_VERSION
dscharrer Dec 31, 2024
2939ac1
xchacha20: Make conversion explicit
dscharrer Dec 31, 2024
b266694
CMake: Fix test build with CMake 3.0 to 3.11
dscharrer Dec 31, 2024
8b052e7
CMake: Respect CMAKE_POLICY_DEFAULT_CMP0167
dscharrer Dec 31, 2024
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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ if(CMAKE_VERSION VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_VERSION})
endif()

if(DEFINED CMAKE_POLICY_DEFAULT_CMP0167)
cmake_policy(SET CMP0167 ${CMAKE_POLICY_DEFAULT_CMP0167})
endif()

project(innoextract)


Expand Down Expand Up @@ -533,7 +537,7 @@ if(BUILD_TESTS)
add_executable(unittest ${UNITTEST_SOURCES})
target_link_libraries(unittest ${LIBRARIES})

if(CMAKE_VERSION VERSION_LESS 3.12)
if(CMAKE_VERSION VERSION_LESS 3.0)
set_target_properties(unittest PROPERTIES COMPILE_DEFINITIONS INNOEXTRACT_BUILD_TESTS)
get_property(unittest_binary TARGET unittest PROPERTY LOCATION)
else()
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/xchacha20.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void xchacha20::discard(size_t length) {

if(length % sizeof(keystream)) {
update();
pos = length % sizeof(keystream);
pos = boost::uint8_t(length % sizeof(keystream));
}

}
Expand Down
5 changes: 4 additions & 1 deletion src/stream/slice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@
#include <cstring>
#include <limits>


#include <boost/cstdint.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/range/size.hpp>

#include <boost/version.hpp>
#if BOOST_VERSION >= 107200
#include <boost/filesystem/directory.hpp>
#endif
#include <boost/range/size.hpp>

#include "util/console.hpp"
#include "util/load.hpp"
Expand Down
Loading