[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=b96227a

The following commit has been merged in the master branch:
commit b96227ae75ef34605092f22e80d7fc50b94fe0e1
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Sat Apr 30 20:39:34 2016 +0530

    Changed protocol version to TLS 1.0, as TLS 1.2 not supported on many Android device
    Choosing cipher suites manually, same as of Android
---
 core/backends/lan/lanlinkprovider.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index dcba29f..d6e7642 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -409,10 +409,24 @@ void LanLinkProvider::configureSocket(QSslSocket* socket)
 
     socket->setSocketOption(QAbstractSocket::KeepAliveOption, QVariant(1));
 
+    // Setting supported ciphers manually
+    // Top 3 ciphers are for new Android devices, botton two are for old Android devices
+    // FIXME : These cipher suites should be checked whether they are supported or not on device
+    QList<QSslCipher> socketCiphers;
+    socketCiphers.append(QSslCipher("ECDHE-ECDSA-AES256-GCM-SHA384"));
+    socketCiphers.append(QSslCipher("ECDHE-ECDSA-AES128-GCM-SHA256"));
+    socketCiphers.append(QSslCipher("ECDHE-RSA-AES128-SHA"));
+    socketCiphers.append(QSslCipher("RC4-SHA"));
+    socketCiphers.append(QSslCipher("RC4-MD5"));
+
     // Configure for ssl
+    QSslConfiguration sslConfig;
+    sslConfig.setCiphers(socketCiphers);
+    sslConfig.setProtocol(QSsl::TlsV1_0);
+
+    socket->setSslConfiguration(sslConfig);
     socket->setLocalCertificate(KdeConnectConfig::instance()->certificate());
     socket->setPrivateKey(KdeConnectConfig::instance()->privateKeyPath());
-    socket->setProtocol(QSsl::AnyProtocol);
 
     #ifdef TCP_KEEPIDLE
         // time to start sending keepalive packets (seconds)

-- 
kdeconnect packaging