diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
| commit | 93b77cacdbb7e6f310c4e20f85c3a24ed5ba18ba (patch) | |
| tree | 55a7688c9969ef4d01625caa58c7f679098c76eb /src/openvpn/plugin.h | |
| parent | daa9ef0efeb5e10a1b43820fbab3a4ff5fbd22f1 (diff) | |
| parent | 20c8675ba46bda97330a4117c459a59a9f1c465e (diff) | |
Merge tag 'upstream/2.4_beta1'
Upstream version 2.4~beta1
Diffstat (limited to 'src/openvpn/plugin.h')
| -rw-r--r-- | src/openvpn/plugin.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvpn/plugin.h b/src/openvpn/plugin.h index 2f8416b..b1e0458 100644 --- a/src/openvpn/plugin.h +++ b/src/openvpn/plugin.h @@ -32,8 +32,8 @@ #ifdef ENABLE_CRYPTO_OPENSSL #include "ssl_verify_openssl.h" #endif -#ifdef ENABLE_CRYPTO_POLARSSL -#include "ssl_verify_polarssl.h" +#ifdef ENABLE_CRYPTO_MBEDTLS +#include "ssl_verify_mbedtls.h" #endif #include "openvpn-plugin.h" @@ -59,7 +59,7 @@ struct plugin { unsigned int plugin_type_mask; int requested_initialization_point; -#ifndef WIN32 +#ifndef _WIN32 void *handle; #else HMODULE module; @@ -127,7 +127,7 @@ int 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 current_cert_depth, openvpn_x509_cert_t *current_cert #endif @@ -183,7 +183,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 current_cert_depth, openvpn_x509_cert_t *current_cert #endif @@ -202,7 +202,7 @@ plugin_call(const struct plugin_list *pl, struct env_set *es) { return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_SSL +#ifdef ENABLE_CRYPTO , -1, NULL #endif ); |