From 7ec02dd1c08854ed8dafb077fa6b027a3eaf1b714b58d9559d5b485fcb859304 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 10 Oct 2016 06:59:31 +0000 Subject: [PATCH] Accepting request 434030 from home:Vogtinator:branches:KDE:Frameworks5:LTS Note to myself: Don't patch late at night... OBS-URL: https://build.opensuse.org/request/show/434030 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kio?expand=0&rev=4 --- 0001-Fix-kio-using-only-tls1.0.patch | 29 ++++++++++++++++++++++++++++ kio.changes | 5 +++++ kio.spec | 3 +++ 3 files changed, 37 insertions(+) create mode 100644 0001-Fix-kio-using-only-tls1.0.patch diff --git a/0001-Fix-kio-using-only-tls1.0.patch b/0001-Fix-kio-using-only-tls1.0.patch new file mode 100644 index 0000000..ce09609 --- /dev/null +++ b/0001-Fix-kio-using-only-tls1.0.patch @@ -0,0 +1,29 @@ +From 428b3b7b07a76a46e235cf9f491d1c1aa0bebf1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= +Date: Mon, 26 Sep 2016 18:15:02 +0100 +Subject: [PATCH] Fix kio using only tls1.0. + +Now kio should use QSsl::SslProtocol::SecureProtocols which will deprecate +unsafe TLS versions when they are no longer safe. + +REVIEW: 129031 +--- + src/core/tcpslavebase.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/tcpslavebase.cpp b/src/core/tcpslavebase.cpp +index b9be69d..27fe3d0 100644 +--- a/src/core/tcpslavebase.cpp ++++ b/src/core/tcpslavebase.cpp +@@ -492,7 +492,7 @@ bool TCPSlaveBase::startSsl() + if (d->usingSSL) { + return false; + } +- return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk; ++ return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk; + } + + TCPSlaveBase::SslResult TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal(KTcpSocket::SslVersion version, +-- +2.10.0 + diff --git a/kio.changes b/kio.changes index 8cf22e8..b8ce9b2 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 9 09:08:59 UTC 2016 - fabian@ritter-vogt.de + +- Add 0001-Fix-kio-using-only-tls1.0.patch + ------------------------------------------------------------------- Wed Oct 5 15:58:21 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 2e8baac..4454508 100644 --- a/kio.spec +++ b/kio.spec @@ -77,6 +77,8 @@ Source1: baselibs.conf Patch0: kio_help-fallback-to-kde4-docs.patch # PATCH-FIX-UPSTREAM Fix-launching-terminal-desktop-files-with-konsole.patch Patch1: Fix-launching-terminal-desktop-files-with-konsole.patch +# PATCH-FIX-UPSTREAM 0001-Fix-kio-using-only-tls1.0.patch +Patch2: 0001-Fix-kio-using-only-tls1.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -124,6 +126,7 @@ Development files. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build