From: Bernard Spil Date: Mon, 19 Sep 2016 19:11:45 +0000 (+0200) Subject: libressl: fix version output X-Git-Tag: curl-7_51_0~144 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01c8db47aa020d426c196f5f4968f710396dc164;p=thirdparty%2Fcurl.git libressl: fix version output LibreSSL defines `OPENSSL_VERSION_NUMBER` as `0x20000000L` for all versions returning `LibreSSL/2.0.0` for any LibreSSL version. This change provides a local OpenSSL_version_num function replacement returning LIBRESSL_VERSION_NUMBER instead. Closes #1029 --- diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index dd6f1c99c1..ddfc66da50 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -119,8 +119,15 @@ #define X509_get0_notAfter(x) X509_get_notAfter(x) #define CONST_EXTS /* nope */ #define CONST_ASN1_BIT_STRING /* nope */ +#ifdef LIBRESSL_VERSION_NUMBER +static unsigned long OpenSSL_version_num(void) +{ + return LIBRESSL_VERSION_NUMBER; +} +#else #define OpenSSL_version_num() SSLeay() #endif +#endif #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ !defined(LIBRESSL_VERSION_NUMBER)