diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-10-30 12:21:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-01 11:51:20 -0800 |
| commit | c06927016f0b3e51ba725b57e6f20f0f5c74dbc7 (patch) | |
| tree | c48c49801527ff43a24b81def8104937946ea723 | |
| parent | 439876b38cb8caf38ed957bdf0caeeeedfac740d (diff) | |
Formatting
| -rw-r--r-- | paramiko/packet.py | 3 | ||||
| -rw-r--r-- | paramiko/transport.py | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/paramiko/packet.py b/paramiko/packet.py index b922000c..2be2bb2b 100644 --- a/paramiko/packet.py +++ b/paramiko/packet.py @@ -389,7 +389,8 @@ class Packetizer (object): if self.__dump_packets: self._log(DEBUG, util.format_binary(header, 'IN: ')) packet_size = struct.unpack('>I', header[:4])[0] - # leftover contains decrypted bytes from the first block (after the length field) + # leftover contains decrypted bytes from the first block (after the + # length field) leftover = header[4:] if (packet_size - len(leftover)) % self.__block_size_in != 0: raise SSHException('Invalid packet blocking') diff --git a/paramiko/transport.py b/paramiko/transport.py index 5d6ffa67..7d0857c8 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1599,9 +1599,11 @@ class Transport (threading.Thread, ClosingContextManager): try: self.packetizer.write_all(b(self.local_version + '\r\n')) self._check_banner() - # The above is actually very much part of the handshake, but sometimes the banner can be read - # but the machine is not responding, for example when the remote ssh daemon is loaded in to memory - # but we can not read from the disk/spawn a new shell. + # The above is actually very much part of the handshake, but + # sometimes the banner can be read but the machine is not + # responding, for example when the remote ssh daemon is loaded + # in to memory but we can not read from the disk/spawn a new + # shell. # Make sure we can specify a timeout for the initial handshake. # Re-use the banner timeout for now. self.packetizer.start_handshake(self.handshake_timeout) @@ -1909,8 +1911,8 @@ class Transport (threading.Thread, ClosingContextManager): engine = self._get_cipher(self.remote_cipher, key_in, IV_in) mac_size = self._mac_info[self.remote_mac]['size'] mac_engine = self._mac_info[self.remote_mac]['class'] - # initial mac keys are done in the hash's natural size (not the potentially truncated - # transmission size) + # initial mac keys are done in the hash's natural size (not the + # potentially truncated transmission size) if self.server_mode: mac_key = self._compute_key('E', mac_engine().digest_size) else: @@ -1936,8 +1938,8 @@ class Transport (threading.Thread, ClosingContextManager): engine = self._get_cipher(self.local_cipher, key_out, IV_out) mac_size = self._mac_info[self.local_mac]['size'] mac_engine = self._mac_info[self.local_mac]['class'] - # initial mac keys are done in the hash's natural size (not the potentially truncated - # transmission size) + # initial mac keys are done in the hash's natural size (not the + # potentially truncated transmission size) if self.server_mode: mac_key = self._compute_key('F', mac_engine().digest_size) else: |