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_connection_handler.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_connection_handler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index c059834b27..180698d741 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -1187,7 +1187,10 @@ init_ssh(client = Role, Vsn, Version, Options, Socket) -> opts = Options, userauth_supported_methods = AuthMethods, peer = {PeerName, PeerAddr}, - available_host_keys = supported_host_keys(Role, KeyCb, Options) + available_host_keys = supported_host_keys(Role, KeyCb, Options), + random_length_padding = proplists:get_value(max_random_length_padding, + Options, + (#ssh{})#ssh.random_length_padding) }; init_ssh(server = Role, Vsn, Version, Options, Socket) -> @@ -1207,7 +1210,10 @@ init_ssh(server = Role, Vsn, Version, Options, Socket) -> userauth_methods = AuthMethodsAsList, kb_tries_left = 3, peer = {undefined, PeerAddr}, - available_host_keys = supported_host_keys(Role, KeyCb, Options) + available_host_keys = supported_host_keys(Role, KeyCb, Options), + random_length_padding = proplists:get_value(max_random_length_padding, + Options, + (#ssh{})#ssh.random_length_padding) }. supported_host_keys(client, _, Options) -> |