diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-11-03 11:12:42 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-11-03 11:12:42 +0100 |
commit | b117a60e81c3d67880cd8b0079041c92a0818d96 (patch) | |
tree | 8db87c3e0710ce5b2201d7734a93dd3024631b1c /src | |
parent | 7fe38b0200979c15cc27a84ab51b2730e7f2d30e (diff) | |
download | fastd-b117a60e81c3d67880cd8b0079041c92a0818d96.tar fastd-b117a60e81c3d67880cd8b0079041c92a0818d96.zip |
Allow building without NaCl again
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/crypto/cipher/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/crypto/mac/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/fastd.c | 4 | ||||
-rw-r--r-- | src/fastd_config.h.in | 2 | ||||
-rw-r--r-- | src/methods/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/methods/xsalsa20_poly1305/CMakeLists.txt | 1 |
8 files changed, 19 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 361b546..6c882b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,14 +6,14 @@ link_directories(${UECC_LIBRARY_DIRS} ${NACL_LIBRARY_DIRS}) include(generate_version) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fastd_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/fastd_config.h) - include(fastd_module) add_subdirectory(protocols) add_subdirectory(methods) add_subdirectory(crypto) +include(check_reqs) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fastd_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/fastd_config.h) BISON_TARGET(fastd_config_parse config.y ${CMAKE_CURRENT_BINARY_DIR}/config.yy.c) diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt index 3d70c70..addb28c 100644 --- a/src/crypto/cipher/CMakeLists.txt +++ b/src/crypto/cipher/CMakeLists.txt @@ -31,6 +31,10 @@ macro(fastd_cipher_impl_link_libraries cipher name) fastd_module_link_libraries(cipher "${cipher} ${name}" ${ARGN}) endmacro(fastd_cipher_impl_link_libraries) +macro(fastd_cipher_impl_require cipher name) + fastd_module_require(cipher "${cipher} ${name}" ${ARGN}) +endmacro(fastd_cipher_impl_require) + add_subdirectory(aes128_ctr) diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt index 50e2283..676aa5d 100644 --- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt +++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt @@ -3,3 +3,4 @@ fastd_cipher_impl(aes128-ctr nacl ) fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS}) fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES}) +fastd_cipher_impl_require(aes128-ctr nacl NACL) diff --git a/src/crypto/mac/CMakeLists.txt b/src/crypto/mac/CMakeLists.txt index 8c80ee1..fe13ace 100644 --- a/src/crypto/mac/CMakeLists.txt +++ b/src/crypto/mac/CMakeLists.txt @@ -31,6 +31,10 @@ macro(fastd_mac_impl_link_libraries mac name) fastd_module_link_libraries(mac "${mac} ${name}" ${ARGN}) endmacro(fastd_mac_impl_link_libraries) +macro(fastd_mac_impl_require mac name) + fastd_module_require(mac "${mac} ${name}" ${ARGN}) +endmacro(fastd_mac_impl_require) + add_subdirectory(ghash) diff --git a/src/fastd.c b/src/fastd.c index 6c2b9e5..f30511d 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -39,7 +39,7 @@ #include <syslog.h> #include <sys/resource.h> -#ifdef USE_LIBSODIUM +#ifdef HAVE_LIBSODIUM #include <sodium/core.h> #endif @@ -739,7 +739,7 @@ static void drop_caps(fastd_context_t *ctx) { } int main(int argc, char *argv[]) { -#ifdef USE_LIBSODIUM +#ifdef HAVE_LIBSODIUM sodium_init(); #endif diff --git a/src/fastd_config.h.in b/src/fastd_config.h.in index dd54033..8ef3aa0 100644 --- a/src/fastd_config.h.in +++ b/src/fastd_config.h.in @@ -45,7 +45,7 @@ #cmakedefine WITH_CMDLINE_COMMANDS -#cmakedefine USE_LIBSODIUM +#cmakedefine HAVE_LIBSODIUM #define MAX_CONFIG_DEPTH @MAX_CONFIG_DEPTH_NUM@ diff --git a/src/methods/CMakeLists.txt b/src/methods/CMakeLists.txt index f67ea0c..3d1e2e2 100644 --- a/src/methods/CMakeLists.txt +++ b/src/methods/CMakeLists.txt @@ -17,6 +17,10 @@ macro(fastd_method_link_libraries) fastd_module_link_libraries(method ${ARGN}) endmacro(fastd_method_link_libraries) +macro(fastd_method_require) + fastd_module_require(method ${ARGN}) +endmacro(fastd_method_require) + add_subdirectory(null) add_subdirectory(generic_gcm) diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt index d071d99..97dee39 100644 --- a/src/methods/xsalsa20_poly1305/CMakeLists.txt +++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt @@ -3,3 +3,4 @@ fastd_method(xsalsa20-poly1305 ) fastd_method_include_directories(xsalsa20-poly1305 ${NACL_INCLUDE_DIRS}) fastd_method_link_libraries(xsalsa20-poly1305 method_common ${NACL_LIBRARIES}) +fastd_method_require(xsalsa20-poly1305 NACL) |