diff options
| author | Antonio Quartulli | 2017-12-04 09:01:10 +0800 |
|---|---|---|
| committer | Gert Doering | 2017-12-04 19:12:27 +0100 |
| commit | c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5 (patch) | |
| tree | 8ae24311de7729f15e749f0c885bffdf7a33f270 /src/openvpn/plugin.c | |
| parent | f3fec49b1c916a701058ef2445b4c07005c30673 (diff) | |
| download | openvpn-c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5.zip openvpn-c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5.tar.gz | |
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 <a@unstable.cc>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
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 <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/plugin.c')
| -rw-r--r-- | src/openvpn/plugin.c | 23 |
1 files changed, 6 insertions, 17 deletions
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) { |