From c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 4 Dec 2017 09:01:10 +0800 Subject: Remove ENABLE_CRYPTO The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code. This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied. Signed-off-by: Antonio Quartulli Acked-by: Steffan Karger Message-Id: <20171204010110.22091-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16004.html Signed-off-by: Gert Doering --- src/openvpn/plugin.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/openvpn/plugin.c') diff --git a/src/openvpn/plugin.c b/src/openvpn/plugin.c index 557b6bc..7387f8b 100644 --- a/src/openvpn/plugin.c +++ b/src/openvpn/plugin.c @@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p, const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS; @@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth : -1), current_cert -#else - -1, - NULL -#endif }; struct openvpn_plugin_args_func_return retargs; @@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl, const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr) @@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] : NULL, - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif ); switch (status) { -- cgit v1.1