diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-09-13 14:09:24 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-09-13 14:09:24 +0200 |
| commit | 08a6b9f343754c617b2afaed9524153f9f57e0f9 (patch) | |
| tree | 0de60ec110656da30545cfeb63bd9618a2b75cf1 | |
| parent | daa12c6eb36b26031a80e2bfe61453b4c25f53f7 (diff) | |
| download | curl-bagder/libressl-version.tar.gz | |
openssl: show "proper" version number for libressl buildsbagder/libressl-version
| -rw-r--r-- | lib/vtls/openssl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index a9ba33038..6f122883f 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) |