diff options
| author | Hans Nilsson <[email protected]> | 2015-10-19 12:43:47 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-19 12:43:47 +0200 |
| commit | 5ea9a240688f43f81eb607d79e4161f9085024e7 (patch) | |
| tree | 15795977e2a9cff06913cc1c41ba6bf96b39fa7d /lib/ssh/src/ssh.erl | |
| parent | 5f73e439578c4356db26804f47e8b50901a8e45a (diff) | |
| parent | fdae664715f6b64e3f0c61729344bc372b67e1e2 (diff) | |
| download | otp-5ea9a240688f43f81eb607d79e4161f9085024e7.tar.gz otp-5ea9a240688f43f81eb607d79e4161f9085024e7.tar.bz2 otp-5ea9a240688f43f81eb607d79e4161f9085024e7.zip | |
Merge branch 'maint'
* maint:
ssh: Implemented ssh_transport:ecdh_validate_public_key (partly)
ssh: dialyzer fix
public_key: add/update -spec for ssh functions
ssh, public_key: use pubkey encode/decode in app public_key
ssh, public_key: Change EC Public Key representation to what was intended
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index b6ee29efbb..049018b21c 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -391,8 +391,9 @@ handle_option([{negotiation_timeout, _} = Opt|Rest], SocketOptions, SshOptions) handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); -handle_option([parallel_login|Rest], SocketOptions, SshOptions) -> - handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]); +%% (Is handled by proplists:unfold above:) +%% handle_option([parallel_login|Rest], SocketOptions, SshOptions) -> +%% handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]); handle_option([{minimal_remote_max_packet_size, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{id_string, _ID} = Opt|Rest], SocketOptions, SshOptions) -> |