From 207f6697d512241af0fc145e590a234464acf723 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 27 Jul 2015 12:59:35 +0200
Subject: socks5: make server explicitly return "no acceptable method"

---
 src/base/QXmppSocks.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/base/QXmppSocks.cpp')

diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index cd1e306b..905b7a1b 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -32,8 +32,7 @@ const static char SocksVersion = 5;
 
 enum AuthenticationMethod {
     NoAuthentication = 0,
-    GSSAPI = 1,
-    UsernamePassword = 2
+    NoAcceptableMethod = 255
 };
 
 enum Command {
@@ -274,6 +273,12 @@ void QXmppSocksServer::slotReadyRead()
         if (!foundMethod)
         {
             qWarning("QXmppSocksServer received bad authentication method");
+
+            buffer.resize(2);
+            buffer[0] = SocksVersion;
+            buffer[1] = NoAcceptableMethod;
+            socket->write(buffer);
+
             socket->close();
             return;
         }
-- 
cgit v1.2.3