summaryrefslogtreecommitdiff
path: root/src/init_crypt.h
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2014-06-21 19:48:12 +0000
committerChristian Pointner <equinox@anytun.org>2014-06-21 19:48:12 +0000
commitb0eb467680943a45f7ef2346d37efce073b837b2 (patch)
tree6b26bf687a2e6fb22f57db12b7b14ea70a91a210 /src/init_crypt.h
parentfixed typo in description (diff)
parentimplemented key derivation in nettle (diff)
merged nettle branch to trunk
Diffstat (limited to 'src/init_crypt.h')
-rw-r--r--src/init_crypt.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/src/init_crypt.h b/src/init_crypt.h
index 314ebc5..9a8849e 100644
--- a/src/init_crypt.h
+++ b/src/init_crypt.h
@@ -48,7 +48,23 @@ int init_crypt()
#else
-#ifndef USE_SSL_CRYPTO
+#if defined(USE_SSL_CRYPTO)
+
+int init_crypt()
+{
+// nothing here
+ return 0;
+}
+
+#elif defined(USE_NETTLE)
+
+int init_crypt()
+{
+// nothing here
+ return 0;
+}
+
+#else // USE_GCRYPT is the default
#include <gcrypt.h>
@@ -77,14 +93,6 @@ int init_crypt()
return 0;
}
-#else
-
-int init_crypt()
-{
-// nothing here
- return 0;
-}
-
#endif