diff options
| author | Adriaan de Jong <dejong@fox-it.com> | 2011-07-07 10:05:32 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-10-22 17:22:51 +0200 |
| commit | bcedab1f498d480cc1d4d60789b8459c1498c330 (patch) | |
| tree | 3f69add810b985c4ac2aaf8d1079596f906f13cb | |
| parent | 1876ccd012e9e2ca6f8e1cd9e7e9bb4bf24ccecb (diff) | |
| download | openvpn-bcedab1f498d480cc1d4d60789b8459c1498c330.tar.gz openvpn-bcedab1f498d480cc1d4d60789b8459c1498c330.tar.xz openvpn-bcedab1f498d480cc1d4d60789b8459c1498c330.zip | |
Further improvements to plugin support:
- Renamed struct entries to explicitly show them as disabled
- Added a warning if USE_SSL is enabled, but neither ssl_verify_openssl.h or ssl_verify_polarssl.h is included
- If neither of those files is included, disable ssl support for a plugin including openvpn-plugin.h
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
| -rw-r--r-- | openvpn-plugin.h | 19 | ||||
| -rw-r--r-- | plugin.h | 6 | ||||
| -rw-r--r-- | plugin/examples/log_v3.c | 1 |
3 files changed, 15 insertions, 11 deletions
diff --git a/openvpn-plugin.h b/openvpn-plugin.h index 65a3ffd..474c910 100644 --- a/openvpn-plugin.h +++ b/openvpn-plugin.h @@ -24,15 +24,12 @@ #ifndef OPENVPN_PLUGIN_H_ #define OPENVPN_PLUGIN_H_ - #ifdef USE_SSL -#if defined(USE_OPENSSL) -#include "ssl_verify_openssl.h" -#elif defined(USE_POLARSSL) -#include "ssl_verify_polarssl.h" -#else -#error "Either USE_OPENSSL or USE_POLARSSL should be defined" -#endif +# if defined(SSL_VERIFY_OPENSSL_H_) || defined(SSL_VERIFY_POLARSSL_H_) +# define ENABLE_SSL_PLUGIN +# else +# warning "Neither OpenSSL or PoLarSSL headers included, disabling plugin's SSL support" +# endif #endif /*USE_SSL*/ #define OPENVPN_PLUGIN_VERSION 3 @@ -282,12 +279,12 @@ struct openvpn_plugin_args_func_in const char ** const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef USE_SSL +#ifdef ENABLE_SSL_PLUGIN int current_cert_depth; x509_cert_t *current_cert; #else - int current_cert_depth; /* Unused, for compatibility purposes only */ - void *current_cert; /* Unused, for compatibility purposes only */ + int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ + void *__current_cert_disabled; /* Unused, for compatibility purposes only */ #endif }; @@ -29,6 +29,12 @@ #ifndef OPENVPN_PLUGIN_H #define OPENVPN_PLUGIN_H +#ifdef USE_OPENSSL +#include "ssl_verify_openssl.h" +#endif +#ifdef USE_POLARSSL +#include "ssl_verify_polarssl.h" +#endif #include "openvpn-plugin.h" #ifdef ENABLE_PLUGIN diff --git a/plugin/examples/log_v3.c b/plugin/examples/log_v3.c index 2dff6a6..187c592 100644 --- a/plugin/examples/log_v3.c +++ b/plugin/examples/log_v3.c @@ -38,6 +38,7 @@ #define USE_SSL #define USE_OPENSSL +#include "ssl_verify_openssl.h" #include "openvpn-plugin.h" |