diff options
| author | Hans Nilsson <[email protected]> | 2017-08-28 11:49:46 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-09-11 12:11:42 +0200 |
| commit | 4bdb8f52303ceecb5e7c00592b53aa8dcaa49ab9 (patch) | |
| tree | 1171a83a9aa6740992b4829edf2e70d577dab7e8 /lib/ssh/src/ssh_transport.erl | |
| parent | e080dd5ebd5cd014fe00c5483bacf2ea9ff4ea1e (diff) | |
| download | otp-4bdb8f52303ceecb5e7c00592b53aa8dcaa49ab9.tar.gz otp-4bdb8f52303ceecb5e7c00592b53aa8dcaa49ab9.tar.bz2 otp-4bdb8f52303ceecb5e7c00592b53aa8dcaa49ab9.zip | |
ssh: Added option 'modify_algorithms' with prepend, append and rm
If a user wants to enable one non-default algorithm or remove a default one, the option preferred_algorithms is too complicated since it replaces the whole set of algorithms.
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 412f5de9de..c48c0800e4 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -34,6 +34,8 @@ -export([next_seqnum/1, supported_algorithms/0, supported_algorithms/1, default_algorithms/0, default_algorithms/1, + algo_classes/0, algo_class/1, + algo_two_spec_classes/0, algo_two_spec_class/1, handle_packet_part/4, handle_hello_version/1, key_exchange_init_msg/1, @@ -81,6 +83,23 @@ default_algorithms() -> [{K,default_algorithms(K)} || K <- algo_classes()]. algo_classes() -> [kex, public_key, cipher, mac, compression]. +algo_class(kex) -> true; +algo_class(public_key) -> true; +algo_class(cipher) -> true; +algo_class(mac) -> true; +algo_class(compression) -> true; +algo_class(_) -> false. + + +algo_two_spec_classes() -> [cipher, mac, compression]. + +algo_two_spec_class(cipher) -> true; +algo_two_spec_class(mac) -> true; +algo_two_spec_class(compression) -> true; +algo_two_spec_class(_) -> false. + + + default_algorithms(kex) -> supported_algorithms(kex, [ 'diffie-hellman-group1-sha1' % Gone in OpenSSH 7.3.p1 |