diff options
author | Fredrik Gustafsson <[email protected]> | 2012-12-19 11:54:09 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-12-19 11:54:09 +0100 |
commit | b5bfeb6de3a2a79c9581d779112d1cc192225dbd (patch) | |
tree | 3151cdb378e62a3d05f849492ce6c84382355cd3 /lib/ssh/src/ssh.erl | |
parent | 3bd2ba0060f9bcb0d3bddd74a4a5763e520a533f (diff) | |
parent | c228ceb941e26a04317bd2f66a2ee64687f0f869 (diff) | |
download | otp-b5bfeb6de3a2a79c9581d779112d1cc192225dbd.tar.gz otp-b5bfeb6de3a2a79c9581d779112d1cc192225dbd.tar.bz2 otp-b5bfeb6de3a2a79c9581d779112d1cc192225dbd.zip |
Merge branch 'fredrik/ssh/rekeying'
* fredrik/ssh/rekeying:
ssh_basic_SUITE rekey test modifications
Modifications to idle_time testcase
Added test for rekeying
Added doc for rekey_limit option
Renegotiating every hour and every gb sent, can be decreased with option {rekey_limit, integer()}
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r-- | lib/ssh/src/ssh.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index a3ba8148eb..3ef26b1678 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -369,6 +369,8 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{rekey_limit, _} = 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). @@ -449,6 +451,8 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true; Opt; handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 -> Opt; +handle_ssh_option({rekey_limit, Value} = Opt) when is_integer(Value) -> + Opt; handle_ssh_option(Opt) -> throw({error, {eoptions, Opt}}). |