extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-26 06:52:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes config.h setup for crypto options

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@102 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2013-06-17 05:48:09 +00:00
parent b55fd2b010
commit 33b8c00a67
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -11,16 +11,29 @@ option (WITH_OPENSSL "WithOpenSSL" OFF)
option (WITH_COMMON_CRYPTO "WithCommonCrypto" OFF) option (WITH_COMMON_CRYPTO "WithCommonCrypto" OFF)
option (WITH_BOTAN "WithBotan" ON) option (WITH_BOTAN "WithBotan" ON)
if (WITH_BOTAN)
set (WITH_COMMON_CRYPTO OFF)
set (WITH_OPENSSL OFF)
elseif (WITH_COMMON_CRYPTO)
set (WITH_OPENSSL OFF)
endif (WITH_BOTAN)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/CMakeModules/") "${CMAKE_SOURCE_DIR}/CMakeModules/")
# Include Crypto checks here so that they can set values in config.h
if (WITH_COMMON_CRYPTO)
set (WITH_BOTAN OFF)
set (WITH_OPENSSL OFF)
find_library (SECURITY_FRAMEWORK Security)
mark_as_advanced (SECURITY_FRAMEWORK)
elseif (WITH_BOTAN)
set (WITH_COMMON_CRYPTO OFF)
set (WITH_OPENSSL OFF)
find_package (Botan REQUIRED)
elseif (WITH_OPENSSL)
set (WITH_BOTAN OFF)
set (WITH_COMMON_CRYPTO OFF)
find_package (OpenSSL REQUIRED)
include (OpenSSLTests)
endif (WITH_COMMON_CRYPTO)
# Tweak compiler flags. # Tweak compiler flags.
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")

5
cipher/CMakeLists.txt
View File

@ -1,18 +1,13 @@
link_directories (${Encfs_BINARY_DIR}/base) link_directories (${Encfs_BINARY_DIR}/base)
if (WITH_COMMON_CRYPTO) if (WITH_COMMON_CRYPTO)
find_library (SECURITY_FRAMEWORK Security)
mark_as_advanced (SECURITY_FRAMEWORK)
set (EXTRA_LIBS ${SECURITY_FRAMEWORK}) set (EXTRA_LIBS ${SECURITY_FRAMEWORK})
set (EXTRA_SOURCE CommonCrypto.cpp) set (EXTRA_SOURCE CommonCrypto.cpp)
elseif (WITH_OPENSSL) elseif (WITH_OPENSSL)
find_package (OpenSSL REQUIRED)
include (OpenSSLTests)
include_directories (${OPENSSL_INCLUDE_DIR}) include_directories (${OPENSSL_INCLUDE_DIR})
set (EXTRA_LIBS ${OPENSSL_LIBRARIES}) set (EXTRA_LIBS ${OPENSSL_LIBRARIES})
set (EXTRA_SOURCE openssl.cpp) set (EXTRA_SOURCE openssl.cpp)
elseif (WITH_BOTAN) elseif (WITH_BOTAN)
find_package (Botan REQUIRED)
set (EXTRA_LIBS ${BOTAN_LIBRARIES}) set (EXTRA_LIBS ${BOTAN_LIBRARIES})
set (EXTRA_SOURCE botan.cpp) set (EXTRA_SOURCE botan.cpp)
include_directories (${BOTAN_INCLUDE_DIR}) include_directories (${BOTAN_INCLUDE_DIR})

3
cipher/openssl.cpp
View File

@ -131,6 +131,9 @@ class OpenSSLCipher : public BlockCipher {
return false; return false;
} }
#ifdef HAVE_VALGRIND_MEMCHECK_H
VALGRIND_MAKE_MEM_DEFINED(out, length);
#endif
return true; return true;
} }