From 3f88c12315556d6f5f928c7e6a5e56357899ece7 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 21 Nov 2016 18:29:23 +0000 Subject: Fix OpenSSL X509 cert API detection LibreSSL defines a OPENSSL_VERSION_NUMBER of 2.1 but only provides the old OpenSSL 1.0.x API. --- content/fetchers/curl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index 7ddf5121d..7d0e40c24 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -128,8 +128,10 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; static char fetch_proxy_userpwd[100]; -/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */ -#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) +/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed + * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way + */ +#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1010000fL)) static int ns_X509_up_ref(X509 *cert) { cert->references++; -- cgit v1.2.3