summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-09 18:14:22 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-04-09 18:14:22 (GMT)
commitadb9d9d2b0bfbb0f856673e663aad7c4a63020eb (patch)
tree3c722fc2dad07f1725ce81b7a0aefabf9d1d2e47
parenta3627d587ea9a595f46d3144bdebc8a807d839e8 (diff)
downloadtdelibs-adb9d9d2.zip
tdelibs-adb9d9d2.tar.gz
KSSL: Use TLS_client_method instead of TLSv1_client_method
This enables TLS protocols newer than v1.0 This resolves bug 2764 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdeio/kssl/kssl.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index c579471..e5f0921 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -134,7 +134,7 @@ bool KSSL::TLSInit() {
return false;
seedWithEGD();
- d->m_meth = d->kossl->TLSv1_client_method();
+ d->m_meth = d->kossl->TLS_client_method();
d->lastInitTLS = true;
m_pi.reset();
@@ -173,13 +173,15 @@ bool KSSL::initialize() {
m_pi.reset();
- if (!m_cfg->tlsv1() && !m_cfg->sslv3() && m_cfg->sslv2())
- d->m_meth = d->kossl->SSLv2_client_method();
- else if (m_cfg->tlsv1() && !m_cfg->sslv3() && !m_cfg->sslv2())
- d->m_meth = d->kossl->TLSv1_client_method();
- else if (!m_cfg->tlsv1() && m_cfg->sslv3() && !m_cfg->sslv2())
+ if (m_cfg->tlsv1() || (m_cfg->sslv3() && m_cfg->sslv2())) {
+ d->m_meth = d->kossl->TLS_client_method();
+ }
+ else if (m_cfg->sslv3()) {
d->m_meth = d->kossl->SSLv3_client_method();
- else d->m_meth = d->kossl->TLS_client_method();
+ }
+ else if (m_cfg->sslv2()) {
+ d->m_meth = d->kossl->SSLv2_client_method();
+ }
/*
if (m_cfg->sslv2() && m_cfg->sslv3()) kdDebug(7029) << "Double method" << endl;