TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix LibreSSL detection at tdeio/kssl/

Browse Source 
Signed-off-by: Matías Fonzo <selk@dragora.org>
(cherry picked from commit aa9b9581a9)
v3.5.13-sru
Matías Fonzo 5 years ago committed by Slávek Banko
parent 46ecddaeff
commit 7fe5760c2a
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
kio/kssl/kopenssl.cc
Unescape View File

@ -2048,7 +2048,7 @@ X509_LOOKUP_TYPE KOpenSSLProxy::X509_OBJECT_get_type(const X509_OBJECT *a) {
return a->type; return a->type;
#endif #endif
kdWarning() << "X509_OBJECT_get_type not defined!" << endl; 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; return X509_LU_NONE;
#else #else
return 0; 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) { X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) {
if (K_X509_OBJECT_get0_X509) return (K_X509_OBJECT_get0_X509)(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; return a->data.x509;
#endif #endif
kdWarning() << "X509_OBJECT_get0_X509 not defined!" << endl; 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) { ASN1_TIME* KOpenSSLProxy::X509_getm_notAfter(const X509 *x) {
if (K_X509_getm_notAfter) return (K_X509_getm_notAfter)(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); return X509_get_notAfter(x);
#endif #endif
kdWarning() << "X509_get_notAfter not defined!" << endl; 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) { ASN1_TIME* KOpenSSLProxy::X509_getm_notBefore(const X509 *x) {
if (K_X509_getm_notBefore) return (K_X509_getm_notBefore)(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); return X509_get_notBefore(x);
#endif #endif
kdWarning() << "X509_get_notBefore not defined!" << endl; kdWarning() << "X509_get_notBefore not defined!" << endl;

Write Preview
Loading…
Cancel
Save