From e715379e49483f8200abec5bc7ff48f70d73a0cf Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Mar 2014 15:09:17 +0100 Subject: Rename USE_LIBSODIUM and USE_OPENSSL cmake flags to ENABLE_LIBSODIUM and ENABLE_OPENSSL --- src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt | 4 ++-- src/fastd.c | 6 +++--- src/fastd_config.h.in | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt index 5454b3f..18389f5 100644 --- a/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt +++ b/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt @@ -1,6 +1,6 @@ -if(USE_OPENSSL) +if(ENABLE_OPENSSL) fastd_cipher_impl(aes128-ctr openssl aes128_ctr_openssl.c ) fastd_cipher_impl_include_directories(aes128-ctr openssl ${OPENSSL_INCLUDE_DIRS}) -endif(USE_OPENSSL) +endif(ENABLE_OPENSSL) diff --git a/src/fastd.c b/src/fastd.c index 1f80939..58237b1 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -45,7 +45,7 @@ #include #endif -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL #include #include #include @@ -910,7 +910,7 @@ int main(int argc, char *argv[]) { sodium_init(); #endif -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); OPENSSL_config(NULL); @@ -1011,7 +1011,7 @@ int main(int argc, char *argv[]) { free(ctx.eth_addr); free(ctx.ifname); -#ifdef USE_OPENSSL +#ifdef ENABLE_OPENSSL CONF_modules_free(); EVP_cleanup(); ERR_free_strings(); diff --git a/src/fastd_config.h.in b/src/fastd_config.h.in index 29384cd..39856c4 100644 --- a/src/fastd_config.h.in +++ b/src/fastd_config.h.in @@ -47,7 +47,7 @@ #cmakedefine HAVE_LIBSODIUM -#cmakedefine USE_OPENSSL +#cmakedefine ENABLE_OPENSSL #define MAX_CONFIG_DEPTH @MAX_CONFIG_DEPTH_NUM@ -- cgit v1.2.3