diff options
| author | Hans Nilsson <[email protected]> | 2015-08-26 09:53:06 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-26 09:53:06 +0200 |
| commit | b78c3b351fc955aa14bdfc3577890031ffffa9f0 (patch) | |
| tree | 84238b065c7e993633b6383561d3ffd602d49242 /lib/ssh/src/ssh.erl | |
| parent | a93087eafd98bf60b9611c807d0074d304e93383 (diff) | |
| parent | 2564e317e34fe7f928bf6e234998b295848a5c91 (diff) | |
| download | otp-b78c3b351fc955aa14bdfc3577890031ffffa9f0.tar.gz otp-b78c3b351fc955aa14bdfc3577890031ffffa9f0.tar.bz2 otp-b78c3b351fc955aa14bdfc3577890031ffffa9f0.zip | |
Merge branch 'hans/ssh/random_extra_padding/OTP-12831' into maint
* hans/ssh/random_extra_padding/OTP-12831:
ssh: add extra random length padding in packets
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 5b2e0a988c..132de71aed 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -397,6 +397,8 @@ handle_option([{id_string, _ID} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{profile, _ID} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{max_random_length_padding, _Bool} = Opt|Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). @@ -515,6 +517,9 @@ handle_ssh_option({id_string, random}) -> {id_string, {random,2,5}}; %% 2 - 5 random characters handle_ssh_option({id_string, ID} = Opt) when is_list(ID) -> Opt; +handle_ssh_option({max_random_length_padding, Value} = Opt) when is_integer(Value), + Value =< 255 -> + Opt; handle_ssh_option({profile, Value} = Opt) when is_atom(Value) -> Opt; handle_ssh_option(Opt) -> |