diff options
| author | Hans Nilsson <[email protected]> | 2015-10-07 12:19:06 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-07 12:19:06 +0200 |
| commit | f8f1bf3326e98bff7dbfed6f284b136b799c0be4 (patch) | |
| tree | b455c183b4924dd7f1cd79d454a4c63a32cffeb6 /lib/ssh/src/ssh_transport.erl | |
| parent | 5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd (diff) | |
| parent | f6996a8b1f9ecec034700c7ec5e914c7084fa5b5 (diff) | |
| download | otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.tar.gz otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.tar.bz2 otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.zip | |
Merge branch 'hans/ssh/zlib_openssh/OTP-12759' into maint
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 10 |
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', + '[email protected]', + 'zlib' + ]). supported_algorithms(Key, [{client2server,BL1},{server2client,BL2}]) -> [{client2server,As1},{server2client,As2}] = supported_algorithms(Key), |