From 594d84311dd22658df695f238ac562fdcba9f060 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 18 May 2017 20:52:53 +0200
Subject: Revert "ssh: disable rsa-sha2-* for clients"

This reverts commit 4d7ff0a8169141d18335638cf7c6e48d4c18cdf2.
---
 lib/ssh/src/ssh_options.erl | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

(limited to 'lib/ssh/src')

diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 12c0190082..aebb5a7062 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -392,12 +392,6 @@ default(server) ->
             class => user_options
            },
 
-      {preferred_algorithms, def} =>
-          #{default => ssh:default_algorithms(),
-            chk => fun check_preferred_algorithms/1,
-            class => user_options
-           },
-
 %%%%% Undocumented
       {infofun, def} =>
           #{default => fun(_,_,_) -> void end,
@@ -436,26 +430,11 @@ default(client) ->
            },
 
       {pref_public_key_algs, def} =>
-          #{default => ssh_transport:default_algorithms(public_key) -- ['rsa-sha2-256',
-                                                                        'rsa-sha2-512'],
+          #{default => ssh_transport:default_algorithms(public_key),
             chk => fun check_pref_public_key_algs/1,
             class => user_options
            },
 
-      {preferred_algorithms, def} =>
-          #{default => [{K,Vs} || {K,Vs0} <- ssh:default_algorithms(),
-                                  Vs <- [case K of
-                                             public_key -> 
-                                                 Vs0 -- ['rsa-sha2-256',
-                                                         'rsa-sha2-512'];
-                                             _ ->
-                                                 Vs0
-                                         end]
-                       ],
-            chk => fun check_preferred_algorithms/1,
-            class => user_options
-           },
-
       {dh_gex_limits, def} =>
           #{default => {1024, 6144, 8192},      % FIXME: Is this true nowadays?
             chk => fun({Min,I,Max}) ->
@@ -521,6 +500,12 @@ default(common) ->
              class => user_options
             },
 
+       {preferred_algorithms, def} =>
+           #{default => ssh:default_algorithms(),
+             chk => fun check_preferred_algorithms/1,
+             class => user_options
+            },
+
        {id_string, def} => 
            #{default => undefined, % FIXME: see ssh_transport:ssh_vsn/0
              chk => fun(random) -> 
-- 
cgit v1.2.3