From: Bas Pape <baspape@gmail.com>
Date: Sun, 25 Aug 2013 09:07:00 +0000 (+0200)
Subject: Don't respond to key exchange requests in channels
X-Git-Tag: 0.10-beta1~127
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6df87033d69892ce1a12c5242b8d217087d6ddc8;hp=2a912804c20a066356db4e156661468ca49bcc57

Don't respond to key exchange requests in channels
---

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index 0d473981..88c6b3cb 100644
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -232,9 +232,9 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
 
 #ifdef HAVE_QCA2
                 // Handle DH1080 key exchange
-                if (params[1].startsWith("DH1080_INIT")) {
+                if (params[1].startsWith("DH1080_INIT") && !net->isChannelName(target)) {
                     events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Init, params[1].mid(12));
-                } else if (params[1].startsWith("DH1080_FINISH")) {
+                } else if (params[1].startsWith("DH1080_FINISH") && !net->isChannelName(target)) {
                     events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Finish, params[1].mid(14));
                 } else
 #endif