patch-src_lftp_ssl_cc 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- lftp-4.9.2.orig/src/lftp_ssl.cc 2020-01-29 21:36:37.000000000 +0100
  2. +++ lftp-4.9.2/src/lftp_ssl.cc 2024-02-22 14:42:11.060809468 +0100
  3. @@ -34,7 +34,7 @@
  4. #include "misc.h"
  5. #include "network.h"
  6. #include "buffer.h"
  7. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  8. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
  9. #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
  10. #endif
  11. extern "C" {
  12. @@ -775,7 +775,7 @@ error:
  13. #elif USE_OPENSSL
  14. //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata);
  15. -#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
  16. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L)
  17. // for compatibility with older versions
  18. X509_OBJECT *X509_OBJECT_new()
  19. {
  20. @@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_open
  21. ssl_ctx=SSL_CTX_new();
  22. X509_set_default_verify_paths(ssl_ctx->cert);
  23. #else
  24. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  25. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
  26. SSLeay_add_ssl_algorithms();
  27. #endif
  28. ssl_ctx=SSL_CTX_new(SSLv23_client_method());
  29. @@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lf
  30. const char *lftp_ssl_openssl::strerror()
  31. {
  32. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  33. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
  34. SSL_load_error_strings();
  35. #endif
  36. int error=ERR_get_error();