Unbreak - OpenSSL_version_num() was added to libressl but cURL has it's

own alternative for libressl/old openssl which was conflicting. Slightly
annoying because they want to print the LibreSSL version number and
OpenSSL_version_num() gives the fixed 2.0.0 coming from
OPENSSL_VERSION_NUMBER. Discussed with jsing
This commit is contained in:
sthen 2018-02-15 22:13:20 +00:00
parent 02f4c05c7d
commit 952ef4bcaf
2 changed files with 33 additions and 1 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.132 2018/01/27 00:10:59 naddy Exp $
# $OpenBSD: Makefile,v 1.133 2018/02/15 22:13:20 sthen Exp $
COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers
DISTNAME= curl-7.58.0
REVISION= 0
SHARED_LIBS= curl 25.14 # 9.0
CATEGORIES= net
HOMEPAGE= https://curl.haxx.se/

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-lib_vtls_openssl_c,v 1.3 2018/02/15 22:13:20 sthen Exp $
Index: lib/vtls/openssl.c
--- lib/vtls/openssl.c.orig
+++ lib/vtls/openssl.c
@@ -117,12 +117,7 @@
#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
@@ -3527,7 +3522,11 @@ static size_t Curl_ossl_version(char *buffer, size_t s
unsigned long ssleay_value;
sub[2]='\0';
sub[1]='\0';
+#ifdef LIBRESSL_VERSION_NUMBER
+ ssleay_value = LIBRESSL_VERSION_NUMBER;
+#else
ssleay_value = OpenSSL_version_num();
+#endif
if(ssleay_value < 0x906000) {
ssleay_value = SSLEAY_VERSION_NUMBER;
sub[0]='\0';