aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-12-14 13:21:02 +0100
committerErlang/OTP <[email protected]>2017-12-14 13:21:02 +0100
commitaa9046d9df73f837e4b5e0bb327baa3ac0b99860 (patch)
tree611ba556016bc2a3d4853d2ecc691428e1fddb9b
parentd49cac2f423364c6f308fc7a63a83830c55f241a (diff)
downloadotp-aa9046d9df73f837e4b5e0bb327baa3ac0b99860.tar.gz
otp-aa9046d9df73f837e4b5e0bb327baa3ac0b99860.tar.bz2
otp-aa9046d9df73f837e4b5e0bb327baa3ac0b99860.zip
Prepare release
-rw-r--r--lib/ssh/doc/src/notes.xml17
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4c8cbab858..3a2f55a487 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,23 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix problem with OpenSSH 7.2 (and later) clients that has
+ used sha1 instead of sha2 for rsa-sha-256/512 user's
+ public keys.</p>
+ <p>
+ Own Id: OTP-14827 Aux Id: ERL-531 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 668d2358c0..004db6e3a2 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.6.3
+SSH_VSN = 4.6.4
APP_VSN = "ssh-$(SSH_VSN)"