From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 13 Sep 2018 12:09:24 +0000 (+0200)
Subject: openssl: show "proper" version number for libressl builds
X-Git-Tag: curl-7_62_0~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ff5f9405abff825df8c1da0e432081f1877f717;p=thirdparty%2Fcurl.git

openssl: show "proper" version number for libressl builds

Closes #2989
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 841239396d..083e63471a 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -129,16 +129,15 @@
 #define X509_get0_notBefore(x) X509_get_notBefore(x)
 #define X509_get0_notAfter(x) X509_get_notAfter(x)
 #define CONST_EXTS /* nope */
-#ifdef LIBRESSL_VERSION_NUMBER
-static unsigned long OpenSSL_version_num(void)
-{
-  return LIBRESSL_VERSION_NUMBER;
-}
-#else
+#ifndef LIBRESSL_VERSION_NUMBER
 #define OpenSSL_version_num() SSLeay()
 #endif
 #endif
 
+#ifdef LIBRESSL_VERSION_NUMBER
+#define OpenSSL_version_num() LIBRESSL_VERSION_NUMBER
+#endif
+
 #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
     !(defined(LIBRESSL_VERSION_NUMBER) && \
       LIBRESSL_VERSION_NUMBER < 0x20700000L)