aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHenrik <[email protected]>2018-03-14 09:58:15 +0100
committerHenrik <[email protected]>2018-03-14 09:58:15 +0100
commit388b24ea7327ce8c7267b48c3a464ce8c404ddd6 (patch)
treee2d32963f888c4f358e7b020db65a3d591e360ed /lib/ssh
parentc5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (diff)
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
downloadotp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.gz
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.bz2
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/notes.xml49
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 50 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index f5cb3ec254..ba563335a2 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,55 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.6</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Remove a blocking risk when a channel is closed and an
+ operation is tried on that channel after at least a
+ second's time gap.</p>
+ <p>
+ Own Id: OTP-14939</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Added ssh_compat_SUITE.</p>
+ <p>
+ This suite contains a number of interoperability tests
+ mainly with OpenSSH. The tests start docker containers
+ with different OpenSSH and OpenSSL/LibreSSLcryptolib
+ versions and performs a number of tests of supported
+ algorithms.</p>
+ <p>
+ All login methods and all user's public key types are
+ tested both for the client and the server.</p>
+ <p>
+ All algorithms for kex, cipher, host key, mac and
+ compressions are tested with a number of exec and sftp
+ tests, both for the client and the server.</p>
+ <p>
+ Own Id: OTP-14194 Aux Id: OTP-12487 </p>
+ </item>
+ <item>
+ <p>
+ Default exec is disabled when a user-defined shell is
+ enabled.</p>
+ <p>
+ Own Id: OTP-14881</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 480e955ec4..99c5cbd346 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.5
+SSH_VSN = 4.6.6
APP_VSN = "ssh-$(SSH_VSN)"