From f1e82db97780529ccf46b8e7b72d482649b6dcd2 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 1 Oct 2015 10:27:18 +0200 Subject: ssh: Bug in zlib@openssh.com compression fixed --- lib/ssh/src/ssh_transport.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/ssh/src/ssh_transport.erl') 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 'zlib@openssh.com' because there seem to be problems - supported_algorithms(compression, same(['zlib@openssh.com'])); +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','zlib@openssh.com']). - + same(['none', + 'zlib@openssh.com', + 'zlib' + ]). supported_algorithms(Key, [{client2server,BL1},{server2client,BL2}]) -> [{client2server,As1},{server2client,As2}] = supported_algorithms(Key), -- cgit v1.2.3