summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatías Fonzo <selk@dragora.org>2020-01-18 17:36:04 -0300
committerMatías Fonzo <selk@dragora.org>2020-01-18 17:36:04 -0300
commitaa9b9581a97daa50855d815b6724b9112448c96f (patch)
tree6c14d71d435c44ec55bee89829a006139502be3e
parent281e2da7f14eca57104dbd3f7da39506011729a8 (diff)
downloadtdelibs-aa9b9581a97daa50855d815b6724b9112448c96f.tar.gz
tdelibs-aa9b9581a97daa50855d815b6724b9112448c96f.zip
Fix LibreSSL detection at tdeio/kssl/
Signed-off-by: Matías Fonzo <selk@dragora.org>
-rw-r--r--tdeio/kssl/kopenssl.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cc
index 47f5ee3cd..a009bd7e9 100644
--- a/tdeio/kssl/kopenssl.cc
+++ b/tdeio/kssl/kopenssl.cc
@@ -2048,7 +2048,7 @@ X509_LOOKUP_TYPE KOpenSSLProxy::X509_OBJECT_get_type(const X509_OBJECT *a) {
return a->type;
#endif
kdWarning() << "X509_OBJECT_get_type not defined!" << endl;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
return X509_LU_NONE;
#else
return 0;
@@ -2057,7 +2057,7 @@ X509_LOOKUP_TYPE KOpenSSLProxy::X509_OBJECT_get_type(const X509_OBJECT *a) {
X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) {
if (K_X509_OBJECT_get0_X509) return (K_X509_OBJECT_get0_X509)(a);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
return a->data.x509;
#endif
kdWarning() << "X509_OBJECT_get0_X509 not defined!" << endl;
@@ -2067,7 +2067,7 @@ X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) {
ASN1_TIME* KOpenSSLProxy::X509_getm_notAfter(const X509 *x) {
if (K_X509_getm_notAfter) return (K_X509_getm_notAfter)(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
return X509_get_notAfter(x);
#endif
kdWarning() << "X509_get_notAfter not defined!" << endl;
@@ -2076,7 +2076,7 @@ ASN1_TIME* KOpenSSLProxy::X509_getm_notAfter(const X509 *x) {
ASN1_TIME* KOpenSSLProxy::X509_getm_notBefore(const X509 *x) {
if (K_X509_getm_notBefore) return (K_X509_getm_notBefore)(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
return X509_get_notBefore(x);
#endif
kdWarning() << "X509_get_notBefore not defined!" << endl;