From bc53deb8cf2162a4c9f0d61a7386f798d70e4085 Mon Sep 17 00:00:00 2001 From: crane Date: Fri, 12 Oct 2012 12:59:20 +0200 Subject: [PATCH] http://twistedmatrix.com/trac/ticket/6102 Fixed Key Exchange --- conch/ssh/transport.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conch/ssh/transport.py b/conch/ssh/transport.py index 9e0c753..9854257 100644 --- a/conch/ssh/transport.py +++ b/conch/ssh/transport.py @@ -244,7 +244,9 @@ class SSHTransportBase(protocol.Protocol): self.transport.write('%s\r\n' % (self.ourVersionString,)) self.currentEncryptions = SSHCiphers('none', 'none', 'none', 'none') self.currentEncryptions.setKeys('', '', '', '', '', '') - self.sendKexInit() + #Bug http://twistedmatrix.com/trac/ticket/6102 + #Moving to dataReceived + #self.sendKexInit() def sendKexInit(self): @@ -432,7 +434,9 @@ class SSHTransportBase(protocol.Protocol): return i = lines.index(p) self.buf = '\n'.join(lines[i + 1:]) - packet = self.getPacket() + #Moved from connectionMade + self.sendKexInit() + packet = self.getPacket() while packet: messageNum = ord(packet[0]) self.dispatchMessage(messageNum, packet[1:]) -- 1.7.2.5