aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-12-19 11:54:09 +0100
committerFredrik Gustafsson <[email protected]>2012-12-19 11:54:09 +0100
commitb5bfeb6de3a2a79c9581d779112d1cc192225dbd (patch)
tree3151cdb378e62a3d05f849492ce6c84382355cd3 /lib/ssh/doc/src
parent3bd2ba0060f9bcb0d3bddd74a4a5763e520a533f (diff)
parentc228ceb941e26a04317bd2f66a2ee64687f0f869 (diff)
downloadotp-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/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 517cbf1ef9..a0afb5056e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -181,10 +181,13 @@
(simply passed on to the transport protocol).</p></item>
<tag><c><![CDATA[{ipv6_disabled, boolean()}]]></c></tag>
<item>
- <p>Determines if SSH shall use IPv6 or not.</p></item>
- <tag><c><![CDATA[{idle_time, timeout()}]]></c></tag>
+ <p>Determines if SSH shall use IPv6 or not.</p>
+ </item>
+ <tag><c><![CDATA[{rekey_limit, integer()}]]></c></tag>
<item>
- <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
+ <p>Provide, in bytes, when rekeying should be initiated,
+ defaults to one time each GB and one time per hour.</p>
+ </item>
</taglist>
</desc>
</func>