diff options
| author | Hans Nilsson <[email protected]> | 2018-05-09 10:36:05 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-09 10:36:05 +0200 |
| commit | bbb3d151e6329d58b34e526fefb6964677d93104 (patch) | |
| tree | 7efa2de19e9dfd40595165bdfde09bc70581b032 /lib | |
| parent | 143569f30151422b6a5b0fda662061d41ff82d74 (diff) | |
| parent | 3d0c4930775cf2ab304d5e4701b41ffc2936ce53 (diff) | |
| download | otp-bbb3d151e6329d58b34e526fefb6964677d93104.tar.gz otp-bbb3d151e6329d58b34e526fefb6964677d93104.tar.bz2 otp-bbb3d151e6329d58b34e526fefb6964677d93104.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Prepare release
ssh: Renegotiation -> renegotiate
ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
ssh: Fix server crashes for exit-normal signals
Conflicts:
OTP_VERSION
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh_connection_handler.erl
lib/ssh/src/ssh_transport.erl
lib/ssh/vsn.mk
otp_versions.table
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 28 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 3 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 1 |
3 files changed, 29 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 067dcb0bec..d0ed674eee 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -509,6 +509,34 @@ </section> +<section><title>Ssh 4.4.2.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix rare spurios shutdowns of ssh servers when receiveing + <c>{'EXIT',_,normal}</c> messages.</p> + <p> + Own Id: OTP-15018</p> + </item> + <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.4.2.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index edc927e807..11d95f2a6c 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -1881,9 +1881,6 @@ public_algo({#'ECPoint'{},{namedCurve,OID}}) -> Curve = public_key:oid2ssh_curvename(OID), list_to_atom("ecdsa-sha2-" ++ binary_to_list(Curve)). - - - sha('ssh-rsa') -> sha; sha('rsa-sha2-256') -> sha256; sha('rsa-sha2-384') -> sha384; diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 538490ef96..f10e7aa96a 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode SSH_VSN = 4.6.9 + APP_VSN = "ssh-$(SSH_VSN)" |