Ticket #6102: twisted-0001.patch

File twisted-0001.patch, 1.4 KB (added by crane, 4 years ago)

Patch for this Bug

  • conch/ssh/transport.py

    From bc53deb8cf2162a4c9f0d61a7386f798d70e4085 Mon Sep 17 00:00:00 2001
    From: crane <florian.pelgrim@craneworks.de>
    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 b class SSHTransportBase(protocol.Protocol): 
    244244        self.transport.write('%s\r\n' % (self.ourVersionString,))
    245245        self.currentEncryptions = SSHCiphers('none', 'none', 'none', 'none')
    246246        self.currentEncryptions.setKeys('', '', '', '', '', '')
    247         self.sendKexInit()
     247        #Bug http://twistedmatrix.com/trac/ticket/6102
     248        #Moving to dataReceived
     249        #self.sendKexInit()
    248250
    249251
    250252    def sendKexInit(self):
    class SSHTransportBase(protocol.Protocol): 
    432434                        return
    433435                    i = lines.index(p)
    434436                    self.buf = '\n'.join(lines[i + 1:])
    435         packet = self.getPacket()
     437                    #Moved from connectionMade
     438                    self.sendKexInit()
     439        packet = self.getPacket()
    436440        while packet:
    437441            messageNum = ord(packet[0])
    438442            self.dispatchMessage(messageNum, packet[1:])