Merge branch 'hans/ssh/remove_option__public_key_alg/OTP-14263'

3 files changed, 2 insertions, 28 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 1f07e826ce..968983c862 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -243,21 +243,6 @@
 	    <p><c>Peer</c> is in the format of <c>{Host,Port}</c>.</p>
 	  </item>
 
-	  <tag><c><![CDATA[{public_key_alg, 'ssh-rsa' | 'ssh-dss'}]]></c></tag>
-	  <item>
-	    <note>
-	      <p>This option will be removed in OTP 20, but is kept for compatibility. It is ignored if
-	      the preferred <c>pref_public_key_algs</c> option is used.</p>
-	    </note>
-            <p>Sets the preferred public key algorithm to use for user
-	    authentication. If the preferred algorithm fails,
-	    the other algorithm is tried. If <c>{public_key_alg, 'ssh-rsa'}</c> is set, it is translated
-	    to <c>{pref_public_key_algs, ['ssh-rsa','ssh-dss']}</c>.  If it is 
-	    <c>{public_key_alg, 'ssh-dss'}</c>, it is translated
-	    to <c>{pref_public_key_algs, ['ssh-dss','ssh-rsa']}</c>.
-	    </p>
-	  </item>
-
 	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
 	  <item>
             <p>List of user (client) public key algorithms to try to use.</p>
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 395be6b220..a882a01eaf 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -200,17 +200,6 @@ save({K,V}, _, _) when K == reuseaddr ;
 save({allow_user_interaction,V}, Opts, Vals) ->
     save({user_interaction,V}, Opts, Vals);
 
-save({public_key_alg,V}, Defs, Vals) ->         % To remove in OTP-20
-    New = case V of
-              'ssh-rsa' -> ['ssh-rsa', 'ssh-dss'];
-              ssh_rsa   -> ['ssh-rsa', 'ssh-dss'];
-              'ssh-dss' -> ['ssh-dss', 'ssh-rsa'];
-              ssh_dsa   -> ['ssh-dss', 'ssh-rsa'];
-              _ -> error({eoptions, {public_key_alg,V},
-                          "Unknown algorithm, try pref_public_key_algs instead"})
-          end,
-    save({pref_public_key_algs,New}, Defs, Vals);
-
 %% Special case for socket options 'inet' and 'inet6'
 save(Inet, Defs, OptMap) when Inet==inet ; Inet==inet6 ->
     save({inet,Inet}, Defs, OptMap);
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 687e6efaf3..7eda009552 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -333,7 +333,7 @@ erlang_client_openssh_server_publickey_rsa(Config) when is_list(Config) ->
 		[{_,_, not_encrypted}] ->
 		    ConnectionRef =
 			ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-					     [{public_key_alg, ssh_rsa},
+					     [{pref_public_key_algs, ['ssh-rsa','ssh-dss']},
 					      {user_interaction, false},
 					      silently_accept_hosts]),
 		    {ok, Channel} =
@@ -354,7 +354,7 @@ erlang_client_openssh_server_publickey_dsa() ->
 erlang_client_openssh_server_publickey_dsa(Config) when is_list(Config) ->
     ConnectionRef =
 	ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-			     [{public_key_alg, ssh_dsa},
+			     [{pref_public_key_algs, ['ssh-dss','ssh-rsa']},
 			      {user_interaction, false},
 			      silently_accept_hosts]),
     {ok, Channel} =