diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:56:05 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-14 10:56:05 -0400 |
commit | 191fd465f166588922ccbf08b65d4479d8520d6a (patch) | |
tree | 673a3ad36d919009d2621b6e1d3b102cf7988aa9 /paramiko/packet.py | |
parent | 6c6969c1882e62d6249264d2df46ff452eb53e7e (diff) | |
parent | fa86d655dc8f08eb9171930c41b508e2bee08b08 (diff) | |
download | paramiko-191fd465f166588922ccbf08b65d4479d8520d6a.tar.gz |
Merge branch 'master' into use-urandom
Conflicts:
paramiko/dsskey.py
paramiko/ecdsakey.py
paramiko/hostkeys.py
paramiko/kex_gex.py
paramiko/kex_group1.py
paramiko/pkey.py
paramiko/primes.py
paramiko/rsakey.py
tests/test_pkey.py
Diffstat (limited to 'paramiko/packet.py')
-rw-r--r-- | paramiko/packet.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/paramiko/packet.py b/paramiko/packet.py index 0e41b851..e97d92f0 100644 --- a/paramiko/packet.py +++ b/paramiko/packet.py @@ -26,6 +26,7 @@ import socket import struct import threading import time +from hmac import HMAC from paramiko import util from paramiko.common import linefeed_byte, cr_byte_value, asbytes, MSG_NAMES, \ @@ -35,12 +36,6 @@ from paramiko.ssh_exception import SSHException, ProxyCommandFailure from paramiko.message import Message -try: - from r_hmac import HMAC -except ImportError: - from Crypto.Hash.HMAC import HMAC - - def compute_hmac(key, message, digest_class): return HMAC(key, message, digest_class).digest() @@ -360,7 +355,7 @@ class Packetizer (object): raise SSHException('Mismatched MAC') padding = byte_ord(packet[0]) payload = packet[1:packet_size - padding] - + if self.__dump_packets: self._log(DEBUG, 'Got payload (%d bytes, %d padding)' % (packet_size, padding)) |