aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-05-07 12:49:59 +0200
committerErlang/OTP <[email protected]>2018-05-07 12:49:59 +0200
commitfb7a6857c0b35da88548c05910f34be813d1d81d (patch)
treef1503f101e05f5a44a99e0a2996afc114f905b13 /lib/ssh
parent3a858588dbf5451eeaaebda381ce6d5adb04c6b6 (diff)
downloadotp-fb7a6857c0b35da88548c05910f34be813d1d81d.tar.gz
otp-fb7a6857c0b35da88548c05910f34be813d1d81d.tar.bz2
otp-fb7a6857c0b35da88548c05910f34be813d1d81d.zip
Prepare release
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/notes.xml22
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 23 insertions, 1 deletions
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)"