diff options
| author | Hans Nilsson <[email protected]> | 2015-05-20 14:02:32 +0200 |
|---|---|---|
| committer | Hans <[email protected]> | 2015-05-26 15:08:26 +0200 |
| commit | 12f96d2a414bb44c0c5268bc18741f6bad9bbe09 (patch) | |
| tree | 7954a27878bdd1b955b0bdb497f809aa93d42f38 /lib/ssh/src | |
| parent | e5715f37dcfd9c21103232e699390d9736180923 (diff) | |
| download | otp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.tar.gz otp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.tar.bz2 otp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.zip | |
ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'
The 'compression' option was used in the test cases. The new option 'preferred_algorithms' is
much more powerful and can be used as a replacement.
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index c3b0e3edc1..57f7ae8b5e 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -330,8 +330,6 @@ handle_option([{pwdfun, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{key_cb, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); -handle_option([{compression, _} = Opt | Rest], SocketOptions, SshOptions) -> - handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); %%Backwards compatibility handle_option([{allow_user_interaction, Value} | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option({user_interaction, Value}) | SshOptions]); diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 95840c94ad..7162d18b19 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -495,6 +495,7 @@ select_algorithm(Role, Client, Server) -> decompress = Decompression, c_lng = C_Lng, s_lng = S_Lng}, +%%ct:pal("~p~n Client=~p~n Server=~p~n Alg=~p~n",[Role,Client,Server,Alg]), {ok, Alg}. select_encrypt_decrypt(client, Client, Server) -> |