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 <mfilippos@yandex.ru>
(cherry picked from commit 86fea6f5c5)
r14.0.x
Mavridis Philippe 6 years ago committed by Slávek Banko
parent fe423b35a8
commit c5d222de8e
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -48,7 +48,8 @@ class KOpenSSLProxyPrivate;
#include <openssl/stack.h> #include <openssl/stack.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#undef crypt #undef crypt
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#define STACK OPENSSL_STACK #define STACK OPENSSL_STACK
#else #else
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #if OPENSSL_VERSION_NUMBER >= 0x10000000L
@ -59,7 +60,7 @@ class KOpenSSLProxyPrivate;
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#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_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
typedef int X509_LOOKUP_TYPE; typedef int X509_LOOKUP_TYPE;
#endif #endif

@ -1069,7 +1069,7 @@ return qba;
#define NETSCAPE_CERT_HDR "certificate" #define NETSCAPE_CERT_HDR "certificate"
#ifdef KSSL_HAVE_SSL #ifdef KSSL_HAVE_SSL
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBERSSL_VERSION_NUMBER)
typedef struct NETSCAPE_X509_st typedef struct NETSCAPE_X509_st
{ {
ASN1_OCTET_STRING *header; ASN1_OCTET_STRING *header;

Loading…
Cancel
Save