From 86fea6f5c542ba7113dbc598d8b4c18be69901f2 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Thu, 9 May 2019 14:32:06 +0300 Subject: Added some checks in KSSL (in TDEIO) to correctly recognize LibreSSL (which is a fork of OpenSSL 1.0.1b) This resolves issue #28. Signed-off-by: Mavridis Philippe --- tdeio/kssl/kopenssl.h | 5 +++-- tdeio/kssl/ksslcertificate.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index be335b199..312aef2c8 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -48,7 +48,8 @@ class KOpenSSLProxyPrivate; #include #include #undef crypt -#if OPENSSL_VERSION_NUMBER >= 0x10100000L + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) #define STACK OPENSSL_STACK #else #if OPENSSL_VERSION_NUMBER >= 0x10000000L @@ -59,7 +60,7 @@ class KOpenSSLProxyPrivate; #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); typedef int X509_LOOKUP_TYPE; #endif diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc index 2df78fef7..fb0d10a05 100644 --- a/tdeio/kssl/ksslcertificate.cc +++ b/tdeio/kssl/ksslcertificate.cc @@ -1069,7 +1069,7 @@ return qba; #define NETSCAPE_CERT_HDR "certificate" #ifdef KSSL_HAVE_SSL -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBERSSL_VERSION_NUMBER) typedef struct NETSCAPE_X509_st { ASN1_OCTET_STRING *header; -- cgit v1.2.3