aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-05-09 10:36:51 +0200
committerHans Nilsson <[email protected]>2018-05-09 10:36:51 +0200
commit73b86332069c2c5c3600206134c2c15f847c58d6 (patch)
treec879c405b3e121e50dfbe28a709613ddde611253 /lib/ssh/src
parent837fe8bf4bf3a567c66afec0f0ec3dd70d248cd8 (diff)
parentbbb3d151e6329d58b34e526fefb6964677d93104 (diff)
downloadotp-73b86332069c2c5c3600206134c2c15f847c58d6.tar.gz
otp-73b86332069c2c5c3600206134c2c15f847c58d6.tar.bz2
otp-73b86332069c2c5c3600206134c2c15f847c58d6.zip
Merge branch 'maint'
* maint: 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
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_transport.erl3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 458bdfc258..631c4d0213 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1850,9 +1850,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;