diff options
| author | François Andriot <francois.andriot@free.fr> | 2019-12-04 20:13:36 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-04 20:14:54 +0100 |
| commit | e3382b36bf76c989fdb8a6ba94381bcbcfc0498f (patch) | |
| tree | 579fe0988caad9a547b7b32f7dbec1df2a405417 | |
| parent | 927c64cc6e2ff8a545cac1881071ffb9ed2c36bd (diff) | |
| download | tdelibs-e3382b36bf76c989fdb8a6ba94381bcbcfc0498f.tar.gz tdelibs-e3382b36bf76c989fdb8a6ba94381bcbcfc0498f.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>
(cherry picked from commit a6bbb9e7bc21382b504c8c6fe408a766a3890bb6)
| -rw-r--r-- | kio/kssl/kopenssl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index 91a36df9b..578437d95 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/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; } |