]> granicus.if.org Git - curl/commitdiff
openssl: show "proper" version number for libressl builds
authorDaniel Stenberg <daniel@haxx.se>
Thu, 13 Sep 2018 12:09:24 +0000 (14:09 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 14 Sep 2018 09:57:20 +0000 (11:57 +0200)
Closes #2989

lib/vtls/openssl.c

index 841239396d12b2e396c7c228489005bc5b7bf747..083e63471ae28c7782ad80cbacd4318e4ac8d6fa 100644 (file)
 #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)