diff options
author | James Yonan | 2014-05-08 16:50:36 -0600 |
---|---|---|
committer | Gert Doering | 2014-05-20 11:11:42 +0200 |
commit | 5b17803ebbb0989cf66033387dfa1ae7cb41bb25 (patch) | |
tree | 0375f68426d90e5320c38f8da67cc624d81dfb84 /src | |
parent | e583cae83b8c2590dad0c4ce238bc2a45196f914 (diff) | |
download | openvpn-5b17803ebbb0989cf66033387dfa1ae7cb41bb25.zip openvpn-5b17803ebbb0989cf66033387dfa1ae7cb41bb25.tar.gz |
Fixed some compile issues with show_library_versions()
* Refactored show_library_versions to work around the fact
that some compilers (such as MSVC 2008) can't handle #ifdefs
inside of macro references.
* Declare show_library_versions() in options.h because it's
referenced by other files such as openvpn.c.
* Declare get_ssl_library_version() as returning const char *,
to avoid loss of const qualifier in ssl_openssl.c.
Signed-off-by: James Yonan <james@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1399589436-8730-7-git-send-email-james@openvpn.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8711
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit a91a2d6ad7b139ec78d61c8616b8447847e9ecc6)
Diffstat (limited to 'src')
-rw-r--r-- | src/openvpn/options.c | 15 | ||||
-rw-r--r-- | src/openvpn/options.h | 2 | ||||
-rw-r--r-- | src/openvpn/ssl_backend.h | 2 | ||||
-rw-r--r-- | src/openvpn/ssl_openssl.c | 2 | ||||
-rw-r--r-- | src/openvpn/ssl_polarssl.c | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index fe9b99d..57f8949 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3439,18 +3439,21 @@ usage_small (void) void show_library_versions(const unsigned int flags) { - msg (flags, "library versions: %s%s%s", #ifdef ENABLE_SSL - get_ssl_library_version(), +#define SSL_LIB_VER_STR get_ssl_library_version() #else - "", +#define SSL_LIB_VER_STR "" #endif #ifdef ENABLE_LZO - ", LZO ", lzo_version_string() +#define LZO_LIB_VER_STR ", LZO ", lzo_version_string() #else - "", "" +#define LZO_LIB_VER_STR "", "" #endif - ); + + msg (flags, "library versions: %s%s%s", SSL_LIB_VER_STR, LZO_LIB_VER_STR); + +#undef SSL_LIB_VER_STR +#undef LZO_LIB_VER_STR } static void diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 092eac4..a3b76d3 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -691,6 +691,8 @@ void notnull (const char *arg, const char *description); void usage_small (void); +void show_library_versions(const unsigned int flags); + void init_options (struct options *o, const bool init_gc); void uninit_options (struct options *o); diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index 37a458c..bfd1549 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -485,6 +485,6 @@ void get_highest_preference_tls_cipher (char *buf, int size); * return a pointer to a static memory area containing the * name and version number of the SSL library in use */ -char * get_ssl_library_version(void); +const char * get_ssl_library_version(void); #endif /* SSL_BACKEND_H_ */ diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 1481850..3a222d8 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -1439,7 +1439,7 @@ get_highest_preference_tls_cipher (char *buf, int size) SSL_CTX_free (ctx); } -char * +const char * get_ssl_library_version(void) { return SSLeay_version(SSLEAY_VERSION); diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c index 5bd6d7d..ddccf1d 100644 --- a/src/openvpn/ssl_polarssl.c +++ b/src/openvpn/ssl_polarssl.c @@ -1121,7 +1121,7 @@ get_highest_preference_tls_cipher (char *buf, int size) strncpynt (buf, cipher_name, size); } -char * +const char * get_ssl_library_version(void) { static char polar_version[30]; |