Browse Source

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>
pull/29/head
Mavridis Philippe 6 months ago
parent
commit
86fea6f5c5
2 changed files with 4 additions and 3 deletions
  1. 3
    2
      tdeio/kssl/kopenssl.h
  2. 1
    1
      tdeio/kssl/ksslcertificate.cc

+ 3
- 2
tdeio/kssl/kopenssl.h View File

@@ -48,7 +48,8 @@ class KOpenSSLProxyPrivate;
#include <openssl/stack.h>
#include <openssl/bn.h>
#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 <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_LOOKUP_TYPE;
#endif

+ 1
- 1
tdeio/kssl/ksslcertificate.cc View File

@@ -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;

Loading…
Cancel
Save