From d7d8e49b4aa7f79a4ea62f63121622bb0eec66f2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 15 Oct 2026 12:06:27 +0900 Subject: Requires openssl 1.1 or greater Signed-off-by: Michele Calgaro --- CMakeLists.txt | 11 +-- tdecore/tdehw/tdecryptographiccarddevice.cpp | 11 --- tdeio/kssl/kopenssl.cpp | 114 --------------------------- tdeio/kssl/kopenssl.h | 17 +--- tdeio/kssl/kssl.cpp | 18 ----- tdeio/kssl/ksslcertificate.cpp | 17 ---- tdeio/kssl/ksslsettings.cpp | 5 -- 7 files changed, 6 insertions(+), 187 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43c8d3c5e..34be54c62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1157,15 +1157,12 @@ endif( WITH_LIBBFD ) ##### check for openssl ######################### if( WITH_SSL ) - pkg_search_module( SSL openssl ) + pkg_search_module( SSL openssl>=1.1.0 ) if( NOT SSL_FOUND ) check_include_file( openssl/ssl.h HAVE_OPENSSL_H ) check_library_exists( ssl OPENSSL_init_ssl "" HAVE_LIBSSL_11 ) - if( NOT HAVE_LIBSSL_11 ) - check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL ) - endif( ) check_library_exists( crypto EVP_EncryptInit_ex "" HAVE_LIBCRYPTO ) - if( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVE_LIBSSL) AND HAVE_LIBCRYPTO ) + if( HAVE_OPENSSL_H AND HAVE_LIBSSL_11 AND HAVE_LIBCRYPTO ) set( SSL_FOUND 1 CACHE INTERNAL "" FORCE ) find_file( OPENSSLV_H openssl/opensslv.h ) file( STRINGS "${OPENSSLV_H}" SSL_VERSION REGEX "#[ \t]*define[ \t]*OPENSSL_VERSION_TEXT" ) @@ -1173,10 +1170,10 @@ if( WITH_SSL ) SSL_VERSION "${SSL_VERSION}" ) set( SSL_VERSION "${SSL_VERSION}" CACHE INTERNAL "" FORCE ) message( STATUS "Found OpenSSL: version ${SSL_VERSION}" ) - endif( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVE_LIBSSL) AND HAVE_LIBCRYPTO ) + endif( HAVE_OPENSSL_H AND HAVE_LIBSSL_11 AND HAVE_LIBCRYPTO ) endif( NOT SSL_FOUND ) if( NOT SSL_FOUND ) - tde_message_fatal( "SSL support is requested, but openssl not found on your system" ) + tde_message_fatal( "OpenSSL 1.1 or newer is requested, but openssl not found on your system" ) endif( NOT SSL_FOUND ) set( KSSL_HAVE_SSL 1 ) set( HAVE_SSL 1 ) diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index 2ac87af86..8062504f9 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -644,13 +644,8 @@ TQString TDECryptographicCardDevice::autoPIN() { int returnCode; int index = 0; // Search for the PIN field -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence); asnSeqValueStack = d2i_ASN1_SEQUENCE_ANY(NULL, &asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence)); -#else - uint8_t* asnSeqValueString = ASN1_STRING_data(asnValue->value.sequence); - asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free); -#endif asnSeqValue = sk_ASN1_TYPE_value(asnSeqValueStack, index); if (asnSeqValue) { if (asnSeqValue->value.octet_string->data[0] == ((V_ASN1_CONSTRUCTED | V_ASN1_CONTEXT_SPECIFIC) + index)) { @@ -659,19 +654,13 @@ TQString TDECryptographicCardDevice::autoPIN() { if (!(returnCode & 0x80)) { if (returnCode == (V_ASN1_CONSTRUCTED + index)) { if (d2i_ASN1_GENERALSTRING(&asnGeneralString, &asn1SeqValueObjectData, asn1SeqValueObjectLength) != NULL) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) retString = TQString((const char *)ASN1_STRING_get0_data(asnGeneralString)); -#else - retString = TQString((const char *)ASN1_STRING_data(asnGeneralString)); -#endif } } } } } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) sk_ASN1_TYPE_pop_free(asnSeqValueStack, ASN1_TYPE_free); -#endif } } } diff --git a/tdeio/kssl/kopenssl.cpp b/tdeio/kssl/kopenssl.cpp index 0c23f02f6..27a90694c 100644 --- a/tdeio/kssl/kopenssl.cpp +++ b/tdeio/kssl/kopenssl.cpp @@ -115,14 +115,8 @@ static void* (*K_BIO_get_data) (BIO *a) = 0L; static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, const EVP_CIPHER *,unsigned char *,int , pem_password_cb *, void *) = 0L; -#if OPENSSL_VERSION_NUMBER >= 0x10000000L static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -#else -static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; -static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; -static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -#endif static int (*K_X509_print_fp) (FILE *, X509*) = 0L; static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; @@ -466,14 +460,8 @@ TDEConfig *cfg; K_BIO_write = (int (*) (BIO *b, const void *data, int len)) GET_CRYPTOLIB_SYMBOL("BIO_write"); K_BIO_get_data = (void* (*)(BIO *a)) GET_CRYPTOLIB_SYMBOL("BIO_get_data"); K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) GET_CRYPTOLIB_SYMBOL("PEM_ASN1_write_bio"); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) GET_CRYPTOLIB_SYMBOL("ASN1_item_i2d_fp"); K_NETSCAPE_X509_it = (ASN1_ITEM *) GET_CRYPTOLIB_SYMBOL("NETSCAPE_X509_it"); -#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) GET_CRYPTOLIB_SYMBOL("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) GET_CRYPTOLIB_SYMBOL("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) GET_CRYPTOLIB_SYMBOL("i2d_ASN1_HEADER"); -#endif K_X509_print_fp = (int (*)(FILE*, X509*)) GET_CRYPTOLIB_SYMBOL("X509_print_fp"); K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) GET_CRYPTOLIB_SYMBOL("i2d_PKCS12"); K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) GET_CRYPTOLIB_SYMBOL("i2d_PKCS12_fp"); @@ -866,9 +854,6 @@ SSL_CIPHER *KOpenSSLProxy::SSL_get_current_cipher(SSL *ssl) { long KOpenSSLProxy::_SSL_set_options(SSL *ssl, long options) { if (K_SSL_set_options) return (K_SSL_set_options)(ssl, options); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return this->SSL_set_options(ssl, options); -#endif kdWarning() << "SSL_set_options not defined!" << endl; return -1; } @@ -876,9 +861,6 @@ long KOpenSSLProxy::_SSL_set_options(SSL *ssl, long options) { int KOpenSSLProxy::_SSL_session_reused(SSL *ssl) { if (K_SSL_session_reused) return (K_SSL_session_reused)(ssl); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return this->SSL_session_reused(ssl); -#endif kdWarning() << "SSL_session_reused not defined!" << endl; return -1; } @@ -1114,12 +1096,6 @@ void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, (X509_get0_signature)(psig, palg, x); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!x) return; - if (psig) *psig = x->signature; - if (palg) *palg = x->sig_alg; - return; -#endif kdWarning() << "X509_get0_signature not defined!" << endl; } @@ -1175,9 +1151,6 @@ int KOpenSSLProxy::BIO_write(BIO *b, const void *data, int len) { void *KOpenSSLProxy::BIO_get_data(BIO *a) { if (K_BIO_get_data) return (K_BIO_get_data)(a); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return a->ptr; -#endif kdWarning() << "BIO_get_data not defined!" << endl; return 0L; } @@ -1189,28 +1162,12 @@ int KOpenSSLProxy::PEM_write_bio_X509(BIO *bp, X509 *x) { return -1; } -#if OPENSSL_VERSION_NUMBER >= 0x10000000L int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); kdWarning() << "ANS1_i2d_fp not defined!" << endl; return -1; } -#else -ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - kdWarning() << "X509_ans1_meth not defined!" << endl; - return 0L; -} - - -int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { - if (K_ASN1_i2d_fp && K_i2d_ASN1_HEADER) - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - kdWarning() << "ANS1_i2d_fp not defined!" << endl; - return -1; -} -#endif int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); @@ -1283,9 +1240,6 @@ EVP_PKEY* KOpenSSLProxy::EVP_PKEY_new() { int KOpenSSLProxy::EVP_PKEY_base_id(const EVP_PKEY *pkey) { if (K_EVP_PKEY_base_id) return (K_EVP_PKEY_base_id)(pkey); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return pkey->type; -#endif kdWarning() << "EVP_PKEY_base_id not defined!" << endl; return -1; } @@ -1293,9 +1247,6 @@ int KOpenSSLProxy::EVP_PKEY_base_id(const EVP_PKEY *pkey) { RSA* KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) { if (K_EVP_PKEY_get0_RSA) return (K_EVP_PKEY_get0_RSA)(pkey); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return pkey->pkey.rsa; -#endif kdWarning() << "EVP_PKEY_get0_RSA not defined!" << endl; return 0L; } @@ -1303,9 +1254,6 @@ RSA* KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) { DSA* KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) { if (K_EVP_PKEY_get0_DSA) return (K_EVP_PKEY_get0_DSA)(pkey); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return pkey->pkey.dsa; -#endif kdWarning() << "EVP_PKEY_get0_DSA not defined!" << endl; return 0L; } @@ -1752,13 +1700,6 @@ void KOpenSSLProxy::RSA_get0_key(const RSA *r, (K_RSA_get0_key)(r, n, e, d); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!r) return; - if (n) *n = r->n; - if (e) *e = r->e; - if (d) *d = r->d; - return; -#endif kdWarning() << "REG_get0_key not defined!" << endl; } @@ -1777,13 +1718,6 @@ void KOpenSSLProxy::DSA_get0_pqg(const DSA *d, (K_DSA_get0_pqg)(d, p, q, g); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!d) return; - if (p) *p = d->p; - if (q) *q = d->q; - if (g) *g = d->g; - return; -#endif kdWarning() << "DSA_get0_pqg not defined!" << endl; } @@ -1794,12 +1728,6 @@ void KOpenSSLProxy::DSA_get0_key(const DSA *d, (K_DSA_get0_key)(d, pub_key, priv_key); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!d) return; - if (pub_key) *pub_key = d->pub_key; - if (priv_key) *priv_key = d->priv_key; - return; -#endif kdWarning() << "DSA_get0_key not defined!" << endl; } @@ -1981,45 +1909,30 @@ STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) { const ASN1_TIME* KOpenSSLProxy::X509_CRL_get0_lastUpdate(const X509_CRL *crl) { if (K_X509_CRL_get0_lastUpdate) return (K_X509_CRL_get0_lastUpdate)(crl); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return X509_CRL_get_lastUpdate(crl); -#endif kdWarning() << "X509_CRL_get_lastUpdate not defined!" << endl; return 0L; } const ASN1_TIME* KOpenSSLProxy::X509_CRL_get0_nextUpdate(const X509_CRL *crl) { if (K_X509_CRL_get0_nextUpdate) return (K_X509_CRL_get0_nextUpdate)(crl); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return X509_CRL_get_nextUpdate(crl); -#endif kdWarning() << "X509_CRL_get_nextUpdate not defined!" << endl; return 0L; } X509* KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx) { if (K_X509_STORE_CTX_get_current_cert) return (K_X509_STORE_CTX_get_current_cert)(ctx); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return ctx->current_cert; -#endif kdWarning() << "X509_STORE_CTX_get_current_cert not defined!" << endl; return 0L; } int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *ctx) { if (K_X509_STORE_CTX_get_error) return (K_X509_STORE_CTX_get_error)(ctx); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return ctx->error; -#endif kdWarning() << "X509k_STORE_CTX_get_error not defined!" << endl; return -1; } int KOpenSSLProxy::X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx) { if (K_X509_STORE_CTX_get_error_depth) return (K_X509_STORE_CTX_get_error_depth)(ctx); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return ctx->error_depth; -#endif kdWarning() << "X509_STORE_CTX_get_error_depth not defined!" << endl; return -1; } @@ -2029,10 +1942,6 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s) { (K_X509_STORE_CTX_set_error)(ctx, s); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - ctx->error = s; - return; -#endif kdWarning() << "X509_STORE_CTX_set_error not defined!" << endl; } @@ -2042,40 +1951,23 @@ void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *ctx, (K_X509_STORE_set_verify_cb)(ctx, verify_cb); return; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L - X509_STORE_set_verify_cb_func(ctx, verify_cb); - return; -#endif kdWarning() << "X590_STORE_set_verify_cb not defined!" << endl; } STACK_OF(X509_OBJECT)* KOpenSSLProxy::X509_STORE_get0_objects(X509_STORE *v) { if (K_X509_STORE_get0_objects) return (K_X509_STORE_get0_objects)(v); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - 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) { if (K_X509_OBJECT_get_type) return (K_X509_OBJECT_get_type)(a); -#if OPENSSL_VERSION_NUMBER < 0x10100000L - return a->type; -#endif kdWarning() << "X509_OBJECT_get_type not defined!" << endl; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) return X509_LU_NONE; -#else - return 0; -#endif } 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 || defined(LIBRESSL_VERSION_NUMBER) - return a->data.x509; -#endif kdWarning() << "X509_OBJECT_get0_X509 not defined!" << endl; return 0L; } @@ -2083,18 +1975,12 @@ 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 || defined(LIBRESSL_VERSION_NUMBER) - return X509_get_notAfter(x); -#endif kdWarning() << "X509_get_notAfter not defined!" << endl; return 0L; } 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 || defined(LIBRESSL_VERSION_NUMBER) - return X509_get_notBefore(x); -#endif kdWarning() << "X509_get_notBefore not defined!" << endl; return 0L; } diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index 986ecdc86..8f11f4f1c 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -49,18 +49,12 @@ class KOpenSSLProxyPrivate; #include #undef crypt -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if !defined(LIBRESSL_VERSION_NUMBER) #define STACK OPENSSL_STACK #else -#if OPENSSL_VERSION_NUMBER >= 0x10000000L #define STACK _STACK #endif -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); -typedef int X509_LOOKUP_TYPE; -#endif #endif // KSSL_HAVE_SSL #include @@ -560,13 +554,6 @@ public: */ int PEM_write_bio_X509(BIO *bp, X509 *x); -#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -#endif - /* * ASN1_i2d_fp - used for netscape output */ @@ -1052,7 +1039,7 @@ public: /* cover KOpenSSLProxy API compatibility */ -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_API_COMPAT < 0x10100000L +#if OPENSSL_API_COMPAT < 0x10100000L # undef sk_dup # undef sk_free # undef sk_new diff --git a/tdeio/kssl/kssl.cpp b/tdeio/kssl/kssl.cpp index 9131ce8d9..d9b060de6 100644 --- a/tdeio/kssl/kssl.cpp +++ b/tdeio/kssl/kssl.cpp @@ -284,15 +284,6 @@ int rc; return -1; if (d->session) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (static_cast(d->session->_session)->sess_cert == 0) - { - kdDebug(7029) << "Can't reuse session, no certificate." << endl; - delete d->session; - d->session = 0; - } - else -#endif if (1 == d->kossl->SSL_set_session(d->m_ssl, static_cast(d->session->_session))) { kdDebug(7029) << "Session ID is being reused." << endl; @@ -382,15 +373,6 @@ int rc; return -1; if (d->session) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (static_cast(d->session->_session)->sess_cert == 0) - { - kdDebug(7029) << "Can't reuse session, no certificate." << endl; - delete d->session; - d->session = 0; - } - else -#endif if (1 == d->kossl->SSL_set_session(d->m_ssl, static_cast(d->session->_session))) { kdDebug(7029) << "Session ID is being reused." << endl; diff --git a/tdeio/kssl/ksslcertificate.cpp b/tdeio/kssl/ksslcertificate.cpp index d3f784fec..2d5aa3634 100644 --- a/tdeio/kssl/ksslcertificate.cpp +++ b/tdeio/kssl/ksslcertificate.cpp @@ -1069,44 +1069,27 @@ return qba; #define NETSCAPE_CERT_HDR "certificate" #ifdef KSSL_HAVE_SSL -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) typedef struct NETSCAPE_X509_st { ASN1_OCTET_STRING *header; X509 *cert; } NETSCAPE_X509; #endif -#endif // what a piece of crap this is TQByteArray KSSLCertificate::toNetscape() { TQByteArray qba; #ifdef KSSL_HAVE_SSL -#if OPENSSL_VERSION_NUMBER >= 0x10000000L NETSCAPE_X509 nx; ASN1_OCTET_STRING hdr; -#else - ASN1_HEADER ah; - ASN1_OCTET_STRING os; -#endif KTempFile ktf; -#if OPENSSL_VERSION_NUMBER >= 0x10000000L hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; hdr.length = strlen(NETSCAPE_CERT_HDR); nx.header = &hdr; nx.cert = getCert(); d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -#else - os.data = (unsigned char *)NETSCAPE_CERT_HDR; - os.length = strlen(NETSCAPE_CERT_HDR); - ah.header = &os; - ah.data = (char *)getCert(); - ah.meth = d->kossl->X509_asn1_meth(); - - d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -#endif ktf.close(); diff --git a/tdeio/kssl/ksslsettings.cpp b/tdeio/kssl/ksslsettings.cpp index 354120d8d..d215d6559 100644 --- a/tdeio/kssl/ksslsettings.cpp +++ b/tdeio/kssl/ksslsettings.cpp @@ -203,12 +203,7 @@ void KSSLSettings::load() { m_cfg->setGroup("TLS"); m_bUseTLSv1 = m_cfg->readBoolEntry("Enabled", true); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(OPENSSL_NO_SSL2) m_bUseSSLv2 = false; -#else - m_cfg->setGroup("SSLv2"); - m_bUseSSLv2 = m_cfg->readBoolEntry("Enabled", false); -#endif #if defined(OPENSSL_NO_SSL3) m_bUseSSLv3 = false; -- cgit v1.2.3