From 347f948bcfc5db180a49c7d06c1b67f24b75ad21 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Sun, 1 Nov 2015 14:37:29 -0800
Subject: Fix incorrect hash algorithm selection during kex key generation.

Re #356
---
 paramiko/kex_group14.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'paramiko/kex_group14.py')

diff --git a/paramiko/kex_group14.py b/paramiko/kex_group14.py
index a914aeaf..9f7dd216 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
-- 
cgit v1.2.1