dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-81] 

copy from jaramiko: only check for rekey at the beginning of a packet
This commit is contained in:
Robey Pointer 2005-11-12 01:38:27 +00:00
parent 6de6dc72c6
commit ba6165a4aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
paramiko/packet.py
View File

@ -167,7 +167,7 @@ class Packetizer (object):
self.__keepalive_callback = callback self.__keepalive_callback = callback
self.__keepalive_last = time.time() self.__keepalive_last = time.time()
def read_all(self, n): def read_all(self, n, check_rekey=False):
""" """
Read as close to N bytes as possible, blocking as long as necessary. Read as close to N bytes as possible, blocking as long as necessary.
@ -191,7 +191,7 @@ class Packetizer (object):
except socket.timeout: except socket.timeout:
if self.__closed: if self.__closed:
raise EOFError() raise EOFError()
if self.__need_rekey: if check_rekey and (len(out) == 0) and self.__need_rekey:
raise NeedRekeyException() raise NeedRekeyException()
self._check_keepalive() self._check_keepalive()
return out return out
@ -278,7 +278,7 @@ class Packetizer (object):
@raise SSHException: if the packet is mangled @raise SSHException: if the packet is mangled
@raise NeedRekeyException: if the transport should rekey @raise NeedRekeyException: if the transport should rekey
""" """
header = self.read_all(self.__block_size_in) header = self.read_all(self.__block_size_in, check_rekey=True)
if self.__block_engine_in != None: if self.__block_engine_in != None:
header = self.__block_engine_in.decrypt(header) header = self.__block_engine_in.decrypt(header)
if self.__dump_packets: if self.__dump_packets: