Commit Graph

39 Commits

Author SHA1 Message Date
Sebastian Messmer
abaa72d39c Fix building on Apple Silicon Macs (see https://github.com/cryfs/homebrew-tap/issues/10 ) 2022-10-11 18:48:12 -07:00
Antonio Rojas
3f50e7d238 Fix OpenMP support (#415)
Prevent crypto++ from building the library via an intermediate object target. This is not necessary as we are only building the static library, and breaks passing the build flags that enable openMP support.
2022-02-21 21:22:32 -08:00
Sebastian Messmer
afd6f0d317 Update to CryptoPP 8.6. This fixes a rare bug where CryptoPP 8.5 encrypts data wrongly, see https://github.com/weidai11/cryptopp/issues/1069 2021-12-10 09:10:29 +01:00
Sebastian Messmer
46ada21a30 Update to CryptoPP 8.5.0. This should make it work with Apple M1 2021-04-25 17:19:49 -07:00
Sebastian Messmer
6927a7087a Build with LTO if the compiler supports it 2021-01-06 20:42:07 -08:00
Sebastian Messmer
7d48336f8d Merge branch 'release/0.10' into develop 2020-07-12 20:43:54 -07:00
Sebastian Messmer
d32a98602b Fix Android compilation using patch file https://github.com/termux/termux-root-packages/files/4664745/config.h.patch.txt from https://github.com/cryfs/cryfs/issues/345 2020-07-12 20:43:09 -07:00
Sebastian Messmer
38575f258a In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING 2020-06-28 17:20:02 -07:00
Sebastian Messmer
35b44d6e21 In CMakeLists.txt, rename BUILD_TESTING to CRYPTOPP_BUILD_TESTING so it doesn't clash with our BUILD_TESTING 2020-06-28 10:04:12 -07:00
Sebastian Messmer
6164453c77 Use interface libraries for vendor libraries 2019-10-19 18:35:03 -07:00
Sebastian Messmer
cba95beb17 Update to crypto++ 8.2 2019-06-01 20:34:28 -07:00
Sebastian Messmer
8c189c9ace fix cmake crypto++ 2019-02-28 01:22:04 -08:00
Sebastian Messmer
7b742f41e3 Update to cryptopp 8.1 2019-02-28 01:22:04 -08:00
Sebastian Messmer
6042d4ba6b Build with OpenMP on Windows 2019-01-21 11:47:16 -08:00
Sebastian Messmer
38397a2d86 Cherry-pick some commits from Crypto++ to make OpenMP for scrypt work on Windows 2019-01-21 03:38:20 -08:00
Sebastian Messmer
7adbe4e3ca Fix CryptoPP build on Windows 2019-01-19 13:01:43 -08:00
Sebastian Messmer
490abd5f31 Update to crypto++ 8.0. This fixes an bug where non-AESNI CPUs on Windows decrypted incorrectly 2019-01-12 16:36:23 -08:00
Sebastian Messmer
dedfe71297 Fix passing vars to cryptopp 2018-11-10 17:07:38 -08:00
Sebastian Messmer
08ed966808 OSX: If OpenMP is installed with homebrew or macports, auto-detect its setup 2018-10-15 18:02:52 +02:00
Sebastian Messmer
b66b7bfeb1 Fix OpenMP when installed from Homebrew 2018-10-01 01:31:08 -07:00
Sebastian Messmer
6b739bb7c9 Fix openmp for Ubuntu 2018-09-30 14:18:24 -07:00
Sebastian Messmer
4911fcd4f4 Use CMake targets provided by FindOpenMP instead of manually setting flags if possible 2018-09-28 12:04:50 -07:00
Sebastian Messmer
f90fb5a001 Fix debug mode detection for multi-mode builds like MSVC 2018-09-26 23:13:53 -07:00
Sebastian Messmer
2786558210 Pass through CRYPTOPP_DEBUG and OpenMP_CXX_FLAGS correctly to both, the cryptopp library and the code depending on it 2018-09-26 00:55:12 -07:00
Sebastian Messmer
e132ce4ca8 Disable OpenMP on MSVC because it doesn't support OpenMP 4.0 which is needed by crypto++ and then crashes the build. 2018-09-26 00:21:21 -07:00
Sebastian Messmer
3c10e095d8 Fix OpenMP for old CMake on Linux 2018-09-25 00:41:03 -07:00
Sebastian Messmer
a10dd04dea Fix wrong handling of OpenMP on osx 2018-09-23 22:22:47 -07:00
Sebastian Messmer
ddc95903fe Pass through debug flag to cryptopp 2018-07-08 20:07:49 -07:00
Sebastian Messmer
c0aca65948 Fix CI 2018-05-21 08:09:37 -07:00
Sebastian Messmer
493f1bbc1c Warn if OpenMP is disabled 2018-05-21 00:27:49 -07:00
Sebastian Messmer
d656aac59e fix cmake 2018-05-20 19:21:59 -07:00
Sebastian Messmer
635a6c7bcd Fix OpenMP for osx 2018-05-20 19:21:59 -07:00
Sebastian Messmer
a087f7dc8a Enforce OpenMP build by default, but allow disabling it with a cmake flag 2018-05-20 19:21:59 -07:00
Sebastian Messmer
72f123e38e Simplify and fix nits in cmake 2018-05-20 19:21:59 -07:00
Sebastian Messmer
ca68102a50 Prefer repository-cryptopp to system installed one 2018-05-20 19:21:59 -07:00
Sebastian Messmer
9c98c5d788 Build cryptopp with OpenMP 2018-05-20 19:21:09 -07:00
Sebastian Messmer
6dbee297ce Use cryptopp from vendor/ instead of system 2018-05-20 19:20:45 -07:00
Sebastian Messmer
97d2b21930 Remove cmake warning from cryptopp CMakeLists.txt 2018-05-20 19:20:45 -07:00
Sebastian Messmer
47ae3047e4 Add cryptopp library to vendor/ 2018-05-20 19:20:45 -07:00