summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-03-13 15:09:17 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-03-13 15:09:17 +0100
commite715379e49483f8200abec5bc7ff48f70d73a0cf (patch)
tree8ffce5c4787ff51f6101f6995737530a71ea3f93 /src
parent45da9c9f296215a4d9ff77db0e6d48bda105ddee (diff)
downloadfastd-e715379e49483f8200abec5bc7ff48f70d73a0cf.tar
fastd-e715379e49483f8200abec5bc7ff48f70d73a0cf.zip
Rename USE_LIBSODIUM and USE_OPENSSL cmake flags to ENABLE_LIBSODIUM and ENABLE_OPENSSL
Diffstat (limited to 'src')
-rw-r--r--src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt4
-rw-r--r--src/fastd.c6
-rw-r--r--src/fastd_config.h.in2
3 files changed, 6 insertions, 6 deletions
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 <sodium/core.h>
#endif
-#ifdef USE_OPENSSL
+#ifdef ENABLE_OPENSSL
#include <openssl/conf.h>
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -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@