1From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
2From: Ganael Laplanche <ganael.laplanche@martymac.org>
3Date: Thu, 20 Aug 2020 12:29:05 +0200
4Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
5
6Upstream status: https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0
7Signed-off-by: Artem Panfilov <artemp@synopsys.com>
8Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
9---
10 src/lftp_ssl.cc | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
14index 14a3b9d4..968d3fb2 100644
15--- a/src/lftp_ssl.cc
16+++ b/src/lftp_ssl.cc
17@@ -34,7 +34,7 @@
18 #include "misc.h"
19 #include "network.h"
20 #include "buffer.h"
21-#if OPENSSL_VERSION_NUMBER < 0x10100000L
22+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
23 #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
24 #endif
25 extern "C" {
26@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
27    ssl_ctx=SSL_CTX_new();
28    X509_set_default_verify_paths(ssl_ctx->cert);
29 #else
30-#if OPENSSL_VERSION_NUMBER < 0x10100000L
31+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
32    SSLeay_add_ssl_algorithms();
33 #endif
34    ssl_ctx=SSL_CTX_new(SSLv23_client_method());
35@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o)
36
37 const char *lftp_ssl_openssl::strerror()
38 {
39-#if OPENSSL_VERSION_NUMBER < 0x10100000L
40+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
41    SSL_load_error_strings();
42 #endif
43    int error=ERR_get_error();
44--
452.25.1
46
47