From e0e2286660cfb644e04f223090b8e2d78d76845d Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 2 May 2018 15:27:54 +0200
Subject: ssh: Fix DH group exchange server bug for PuTTY and others following
 draft-draft-00 from 2001 and not the rfc4419

---
 lib/ssh/src/ssh_transport.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 61a1a57063..a160309b95 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1663,13 +1663,13 @@ kex_h(SSH, Curve, Key, Q_c, Q_s, K) ->
 kex_h(SSH, Key, Min, NBits, Max, Prime, Gen, E, F, K) ->
     KeyBin = public_key:ssh_encode(Key, ssh2_pubkey),
     L = if Min==-1; Max==-1 ->
-		%% flag from 'ssh_msg_kex_dh_gex_request_old'
-		%% It was like this before that message was supported,
-		%% why?
+		%% ssh_msg_kex_dh_gex_request_old
 		<<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
 		  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
-		  ?Empint(E), ?Empint(F), ?Empint(K)>>;
+                  ?Euint32(NBits),
+                  ?Empint(Prime), ?Empint(Gen), ?Empint(E), ?Empint(F), ?Empint(K)>>;
 	   true ->
+                %% ssh_msg_kex_dh_gex_request
 		<<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
 		  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
 		  ?Euint32(Min), ?Euint32(NBits), ?Euint32(Max),
-- 
cgit v1.2.3