aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_transport.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-01 10:27:18 +0200
committerHans Nilsson <[email protected]>2015-10-06 15:24:40 +0200
commitf1e82db97780529ccf46b8e7b72d482649b6dcd2 (patch)
treea63689264b1c9b340e5972141ad2da7dfe9d482c /lib/ssh/src/ssh_transport.erl
parent258c8cd05d0a4215255121e7466e4ccd4c8ae82c (diff)
downloadotp-f1e82db97780529ccf46b8e7b72d482649b6dcd2.tar.gz
otp-f1e82db97780529ccf46b8e7b72d482649b6dcd2.tar.bz2
otp-f1e82db97780529ccf46b8e7b72d482649b6dcd2.zip
ssh: Bug in [email protected] compression fixed
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
-rw-r--r--lib/ssh/src/ssh_transport.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index e86c93263f..840564e246 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -65,9 +65,7 @@ default_algorithms() -> [{K,default_algorithms(K)} || K <- algo_classes()].
algo_classes() -> [kex, public_key, cipher, mac, compression].
-default_algorithms(compression) ->
- %% Do not announce '[email protected]' because there seem to be problems
- supported_algorithms(compression, same(['[email protected]']));
+default_algorithms(kex) -> supported_algorithms(kex, []); %% Just to have a call...
default_algorithms(Alg) ->
supported_algorithms(Alg).
@@ -106,8 +104,10 @@ supported_algorithms(mac) ->
]
));
supported_algorithms(compression) ->
- same(['none','zlib','[email protected]']).
-
+ same(['none',
+ 'zlib'
+ ]).
supported_algorithms(Key, [{client2server,BL1},{server2client,BL2}]) ->
[{client2server,As1},{server2client,As2}] = supported_algorithms(Key),