From: Antonio Quartulli <a@unstable.cc>
Date: Sat, 2 Dec 2017 13:45:38 +0000 (+0800)
Subject: Remove SSL_LIB_VER_STR
X-Git-Tag: v2.5_beta1~546
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca78395352e90c5b30015e23f1918a72a6c4a6ab;p=thirdparty%2Fopenvpn.git

Remove SSL_LIB_VER_STR

SSL_LIB_VER_STR made sense only when ENABLE_CRYPTO also
existed. It can now be removed and thus simplify the code.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20171202134541.7688-4-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15951.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 3b2ae9238..7be5f383e 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4087,16 +4087,15 @@ show_windows_version(const unsigned int flags)
 void
 show_library_versions(const unsigned int flags)
 {
-#define SSL_LIB_VER_STR get_ssl_library_version()
 #ifdef ENABLE_LZO
 #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);
+    msg(flags, "library versions: %s%s%s", get_ssl_library_version(),
+        LZO_LIB_VER_STR);
 
-#undef SSL_LIB_VER_STR
 #undef LZO_LIB_VER_STR
 }