Skip to content
Snippets Groups Projects
Commit dc21498576e4 authored by Jeff Forcier's avatar Jeff Forcier
Browse files

Apply slightly modified version of patch from #162

parent eeb7f081ca01
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 8 deletions
paramiko/packet.py
+ 4
− 8
View file @ dc214985
...@@ -33,5 +33,4 @@ ...@@ -33,5 +33,4 @@
from paramiko.message import Message from paramiko.message import Message
got_r_hmac = False
try: try:
...@@ -37,4 +36,3 @@ ...@@ -37,4 +36,3 @@
try: try:
import r_hmac from r_hmac import HMAC
got_r_hmac = True
except ImportError: except ImportError:
...@@ -40,3 +38,4 @@ ...@@ -40,3 +38,4 @@
except ImportError: except ImportError:
pass from Crypto.Hash.HMAC import HMAC
def compute_hmac(key, message, digest_class): def compute_hmac(key, message, digest_class):
...@@ -42,8 +41,5 @@ ...@@ -42,8 +41,5 @@
def compute_hmac(key, message, digest_class): def compute_hmac(key, message, digest_class):
if got_r_hmac: return HMAC(key, message, digest_class).digest()
return r_hmac.HMAC(key, message, digest_class).digest()
from Crypto.Hash import HMAC
return HMAC.HMAC(key, message, digest_class).digest()
class NeedRekeyException (Exception): class NeedRekeyException (Exception):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment