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
|
|
| 244 | 244 | self.transport.write('%s\r\n' % (self.ourVersionString,)) |
| 245 | 245 | self.currentEncryptions = SSHCiphers('none', 'none', 'none', 'none') |
| 246 | 246 | self.currentEncryptions.setKeys('', '', '', '', '', '') |
| 247 | | self.sendKexInit() |
| | 247 | #Bug http://twistedmatrix.com/trac/ticket/6102 |
| | 248 | #Moving to dataReceived |
| | 249 | #self.sendKexInit() |
| 248 | 250 | |
| 249 | 251 | |
| 250 | 252 | def sendKexInit(self): |
| … |
… |
|
| 432 | 434 | return |
| 433 | 435 | i = lines.index(p) |
| 434 | 436 | self.buf = '\n'.join(lines[i + 1:]) |
| 435 | | packet = self.getPacket() |
| | 437 | #Moved from connectionMade |
| | 438 | self.sendKexInit() |
| | 439 | packet = self.getPacket() |
| 436 | 440 | while packet: |
| 437 | 441 | messageNum = ord(packet[0]) |
| 438 | 442 | self.dispatchMessage(messageNum, packet[1:]) |