1 files changed, 0 insertions, 58 deletions
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
deleted file mode 100644
index d10f0193dacc..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 48180b46552d40729a36b7431e97bbe2b5379306 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Thu, 24 Sep 2020 18:46:57 +0200
-Subject: [PATCH 10/10] Do not replace connections for a given deviceId if the
- certs have changed
-
-Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
----
- core/backends/lan/landevicelink.cpp   | 5 +++++
- core/backends/lan/landevicelink.h     | 1 +
- core/backends/lan/lanlinkprovider.cpp | 6 ++++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
-index 8a65fb92..41af6f0e 100644
---- a/core/backends/lan/landevicelink.cpp
-+++ b/core/backends/lan/landevicelink.cpp
-@@ -192,3 +192,8 @@ bool LanDeviceLink::linkShouldBeKeptAlive() {
-     //return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
- 
- }
-+
-+QSslCertificate LanDeviceLink::certificate() const
-+{
-+    return m_socketLineReader->peerCertificate();
-+}
-diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
-index 28f63db2..485c58b5 100644
---- a/core/backends/lan/landevicelink.h
-+++ b/core/backends/lan/landevicelink.h
-@@ -56,6 +56,7 @@ public:
-     bool linkShouldBeKeptAlive() override;
- 
-     QHostAddress hostAddress() const;
-+    QSslCertificate certificate() const;
- 
- private Q_SLOTS:
-     void dataReceived();
-diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
-index f3d6801d..372cdc8f 100644
---- a/core/backends/lan/lanlinkprovider.cpp
-+++ b/core/backends/lan/lanlinkprovider.cpp
-@@ -345,6 +345,12 @@ void LanLinkProvider::encrypted()
-     NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
-     const QString& deviceId = receivedPacket->get<QString>(QStringLiteral("deviceId"));
- 
-+    if (m_links.contains(deviceId) && m_links[deviceId]->certificate() != socket->peerCertificate()) {
-+        socket->disconnectFromHost();
-+        qCWarning(KDECONNECT_CORE) << "Got connection for the same deviceId but certificates don't match. Ignoring " << deviceId;
-+        return;
-+    }
-+
-     addLink(deviceId, socket, receivedPacket, connectionOrigin);
- 
-     // Copied from tcpSocketConnected slot, now delete received packet
--- 
-2.28.0
-