From 169e26ba4facb637831aaaa02d878b988a090ff0 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 2 May 2018 14:44:52 +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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 975053d301..edc927e807 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1839,9 +1839,10 @@ kex_alg_dependent({E, F, K}) ->
     %% diffie-hellman and ec diffie-hellman (with E = Q_c, F = Q_s)
     <<?Empint(E), ?Empint(F), ?Empint(K)>>;
 
-kex_alg_dependent({-1, _, -1, _, _, E, F, K}) ->
+kex_alg_dependent({-1, NBits, -1, Prime, Gen, E, F, K}) ->
     %% ssh_msg_kex_dh_gex_request_old
-    <<?Empint(E), ?Empint(F), ?Empint(K)>>;
+    <<?Euint32(NBits),
+      ?Empint(Prime), ?Empint(Gen), ?Empint(E), ?Empint(F), ?Empint(K)>>;
 
 kex_alg_dependent({Min, NBits, Max, Prime, Gen, E, F, K}) ->
     %% diffie-hellman group exchange
-- 
cgit v1.2.3


From 61cc306b51e26489912eca2ace66d47253084763 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 2 May 2018 15:48:08 +0200
Subject: ssh: Renegotiation -> renegotiate

---
 lib/ssh/src/ssh_connection_handler.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index ad23d82ea8..36152bacf7 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -522,7 +522,7 @@ role({_,Role}) -> Role;
 role({_,Role,_}) -> Role.
 
 -spec renegotiation(state_name()) -> boolean().
-renegotiation({_,_,ReNeg}) -> ReNeg == renegotiation;
+renegotiation({_,_,ReNeg}) -> ReNeg == renegotiate;
 renegotiation(_) -> false.
 
 
-- 
cgit v1.2.3


From fb7a6857c0b35da88548c05910f34be813d1d81d Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 7 May 2018 12:49:59 +0200
Subject: Prepare release

---
 lib/ssh/doc/src/notes.xml | 22 ++++++++++++++++++++++
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index bac7001c5d..ce01a04112 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,28 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Host key hash erroneously calculated for clients
+	    following draft-00 of RFC 4419, for example PuTTY</p>
+          <p>
+	    Own Id: OTP-15064</p>
+        </item>
+        <item>
+          <p>
+	    Renegotiation could fail in some states</p>
+          <p>
+	    Own Id: OTP-15066</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index f327d2ec11..538490ef96 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.8
+SSH_VSN = 4.6.9
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3