diff options
author | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
commit | 8a563e44d42731143f4356edcad0d7469a56ea24 (patch) | |
tree | 4641e9608e76b130ea6afe467a30202494ef0eeb /paramiko/kex_group14.py | |
parent | bbf74c0dbf66c463bd68bd30abcd338796152354 (diff) | |
parent | 31b2fd0709f259961253b9cdc875ce7827abaa68 (diff) | |
download | python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar.gz |
Merge tag 'upstream/1.16.0'
Upstream version 1.16.0
Diffstat (limited to 'paramiko/kex_group14.py')
-rw-r--r-- | paramiko/kex_group14.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/paramiko/kex_group14.py b/paramiko/kex_group14.py index a914aea..9f7dd21 100644 --- a/paramiko/kex_group14.py +++ b/paramiko/kex_group14.py @@ -22,6 +22,7 @@ Standard SSH key exchange ("kex" if you wanna sound cool). Diffie-Hellman of """ from paramiko.kex_group1 import KexGroup1 +from hashlib import sha1 class KexGroup14(KexGroup1): @@ -31,3 +32,4 @@ class KexGroup14(KexGroup1): G = 2 name = 'diffie-hellman-group14-sha1' + hash_algo = sha1 |