summaryrefslogtreecommitdiffstats
path: root/src/openvpn/plugin.c
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2014-11-30 17:44:09 +0100
committerGert Doering <gert@greenie.muc.de>2014-12-31 17:36:54 +0100
commitec828db63f12eeb17f0f8c4de57f766e70161a13 (patch)
tree02c42123b4cc8f4d9bf4fe5e8bde526101b42590 /src/openvpn/plugin.c
parentc3e1809f540db16c23fc74f06d6e8c29a4a6941a (diff)
downloadopenvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.tar.gz
openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.tar.xz
openvpn-ec828db63f12eeb17f0f8c4de57f766e70161a13.zip
Remove ENABLE_SSL define (and --disable-ssl configure option)
Remove the --disable-ssl configure option and accompanying ENABLE_SSL defines in the master/2.4 branch, to reduce the code and testing complexity a bit. This does not remove to runtime option to run without SSL, just the compile time option to not include any SSL-related code. During the community meeting in November 2014 there were no objections amongst he developers present. Also, this has been announced on the -users and -devel mailing lists two weeks ago, without any response whatsoever. Signed-off-by: Steffan Karger <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <54A4248A.1090501@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9371 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/plugin.c')
-rw-r--r--src/openvpn/plugin.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvpn/plugin.c b/src/openvpn/plugin.c
index 54c5b52..60dd2ee 100644
--- a/src/openvpn/plugin.c
+++ b/src/openvpn/plugin.c
@@ -420,7 +420,7 @@ plugin_call_item (const struct plugin *p,
const struct argv *av,
struct openvpn_plugin_string_list **retlist,
const char **envp
-#ifdef ENABLE_SSL
+#ifdef ENABLE_CRYPTO
, int certdepth,
openvpn_x509_cert_t *current_cert
#endif
@@ -449,7 +449,7 @@ plugin_call_item (const struct plugin *p,
(const char ** const) envp,
p->plugin_handle,
per_client_context,
-#ifdef ENABLE_SSL
+#ifdef ENABLE_CRYPTO
(current_cert ? certdepth : -1),
current_cert
#else
@@ -659,7 +659,7 @@ plugin_call_ssl (const struct plugin_list *pl,
const struct argv *av,
struct plugin_return *pr,
struct env_set *es
-#ifdef ENABLE_SSL
+#ifdef ENABLE_CRYPTO
, int certdepth,
openvpn_x509_cert_t *current_cert
#endif
@@ -689,7 +689,7 @@ plugin_call_ssl (const struct plugin_list *pl,
av,
pr ? &pr->list[i] : NULL,
envp
-#ifdef ENABLE_SSL
+#ifdef ENABLE_CRYPTO
,certdepth,
current_cert
#endif