summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2019-12-04 20:13:36 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-12-04 20:13:36 +0100
commita6bbb9e7bc21382b504c8c6fe408a766a3890bb6 (patch)
tree7b3a1d29a68c981f56d2162f3113ae7dcb8ca019
parent82e214c84f333e6b22093ab8ff5afe53aa732cc8 (diff)
downloadtdelibs-a6bbb9e7bc21382b504c8c6fe408a766a3890bb6.tar.gz
tdelibs-a6bbb9e7bc21382b504c8c6fe408a766a3890bb6.zip
Fix missing return values in kopenssl.
Signed-off-by: François Andriot <francois.andriot@free.fr> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdeio/kssl/kopenssl.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cc
index 0fa4e27b..47f5ee3c 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;
}