From 64e65ab888b33749bdf3f33b2a80aa3de08485ee Mon Sep 17 00:00:00 2001 From: François Andriot Date: Wed, 4 Dec 2019 20:13:36 +0100 Subject: Fix missing return values in kopenssl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot Signed-off-by: Slávek Banko (cherry picked from commit a6bbb9e7bc21382b504c8c6fe408a766a3890bb6) --- tdeio/kssl/kopenssl.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cc index 0fa4e27b4..47f5ee3cd 100644 --- a/tdeio/kssl/kopenssl.cc +++ b/tdeio/kssl/kopenssl.cc @@ -2039,6 +2039,7 @@ STACK_OF(X509_OBJECT)* KOpenSSLProxy::X509_STORE_get0_objects(X509_STORE *v) { return v->objs; #endif kdWarning() << "X509_STORE_get0_objects not defined!" << endl; + return 0L; } X509_LOOKUP_TYPE KOpenSSLProxy::X509_OBJECT_get_type(const X509_OBJECT *a) { @@ -2047,6 +2048,11 @@ 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 + return X509_LU_NONE; +#else + return 0; +#endif } X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) { @@ -2055,6 +2061,7 @@ X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) { return a->data.x509; #endif kdWarning() << "X509_OBJECT_get0_X509 not defined!" << endl; + return 0L; } -- cgit v1.2.3