aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-03 10:11:19 +0200
committerHans Nilsson <[email protected]>2017-10-03 10:11:19 +0200
commit8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (patch)
treeb8df1dd71275d77f45e513c84306c86fac6f6627 /lib/ssh/doc
parent237d0c7d230534ef99a11d388ebfd0c1e83af548 (diff)
parent69292a11cd4b31fd3ff73b44f28d527f2d16f555 (diff)
downloadotp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.gz
otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.bz2
otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/notes.xml28
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4ba75b761f..ef3e94a1e1 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,34 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed broken printout</p>
+ <p>
+ Own Id: OTP-14645</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Disable aes_gcm ciphers if peer is OpenSSH 6.2 which is
+ known to have trouble with them in some cases.</p>
+ <p>
+ Own Id: OTP-14638</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6</title>
<section><title>Fixed Bugs and Malfunctions</title>