When building with --disable-crypto the P2MP_SERVER is not defined, thus breaking one place where the struct options auth_token_generate was provided with a default value.
Also remove a lot of compiler warnings from ssl_backend.h due to various undefined structs when doing the same build type. Signed-off-by: David Sommerseth <dav...@openvpn.net> --- src/openvpn/options.c | 5 +++-- src/openvpn/ssl_backend.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index f88e94d..be31ed3 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -869,10 +869,11 @@ init_options (struct options *o, const bool init_gc) #ifdef ENABLE_PKCS11 o->pkcs11_pin_cache_period = -1; #endif /* ENABLE_PKCS11 */ - o->auth_token_generate = false; -/* tmp is only used in P2MP server context */ +/* P2MP server context features */ #if P2MP_SERVER + o->auth_token_generate = false; + /* Set default --tmp-dir */ #ifdef WIN32 /* On Windows, find temp dir via enviroment variables */ diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index 542c373..a61f03a 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -124,6 +124,8 @@ int tls_version_parse(const char *vstr, const char *extra); */ int tls_version_max(void); +#ifdef ENABLE_CRYPTO + /** * Initialise a library-specific TLS context for a server. * @@ -510,4 +512,5 @@ void get_highest_preference_tls_cipher (char *buf, int size); */ const char * get_ssl_library_version(void); +#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */ -- 1.8.3.1 ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
