From: Daniel Stenberg Date: Mon, 14 Dec 2015 08:49:19 +0000 (+0100) Subject: libressl: the latest openssl x509 funcs are not in libressl X-Git-Tag: curl-7_47_0~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=727f775e59e6aef69cf1bd52bbe1ee2d0ffb9259;p=thirdparty%2Fcurl.git libressl: the latest openssl x509 funcs are not in libressl --- diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index e5b0bb99bd..8365465b6b 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -119,14 +119,16 @@ #define OPENSSL_NO_SSL2 #endif -#if OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0+ */ +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \ + !defined(LIBRESSL_VERSION_NUMBER) #define SSLeay_add_ssl_algorithms() SSL_library_init() #define SSLeay() OpenSSL_version_num() #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */ #endif -#if OPENSSL_VERSION_NUMBER >= 0x1000200fL /* 1.0.2 or later */ +#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ + !defined(LIBRESSL_VERSION_NUMBER) #define HAVE_X509_GET0_SIGNATURE 1 #endif