[Openvpn-devel,4/7] Remove SSL_LIB_VER_STR

Message ID 20171202134541.7688-4-a@unstable.cc
State Accepted
Headers show
Series
  • [Openvpn-devel,1/7] Remove option to disable crypto engine
Related show

Commit Message

Antonio Quartulli Dec. 2, 2017, 1:45 p.m.
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>
---
 src/openvpn/options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Steffan Karger Dec. 3, 2017, 2:17 p.m. | #1
Hi,

On 02-12-17 14:45, Antonio Quartulli wrote:
> 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>
> ---
>  src/openvpn/options.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/openvpn/options.c b/src/openvpn/options.c
> index 9d9798f7..3f9ca710 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
>  }
> 

Yes, better.

Acked-by: Steffan Karger <steffan@karger.me>

-Steffan

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Gert Doering Dec. 4, 2017, 6:48 p.m. | #2
Your patch has been applied to the master branch.

commit ca78395352e90c5b30015e23f1918a72a6c4a6ab
Author: Antonio Quartulli
Date:   Sat Dec 2 21:45:38 2017 +0800

     Remove SSL_LIB_VER_STR

     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>


--
kind regards,

Gert Doering


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 9d9798f7..3f9ca710 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
 }