aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/ssh.xml
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-05-09 11:42:49 +0200
committerHans Nilsson <[email protected]>2018-05-09 12:10:21 +0200
commitebcece7f317f6d4e4d580c1f5629f4f46defe272 (patch)
tree63cfe60c2fee11f4f73a8b95bed4f849dadc72e7 /lib/ssh/doc/src/ssh.xml
parent79e3c477f8d0d8ea397820847c576e0a0aaa5323 (diff)
downloadotp-ebcece7f317f6d4e4d580c1f5629f4f46defe272.tar.gz
otp-ebcece7f317f6d4e4d580c1f5629f4f46defe272.tar.bz2
otp-ebcece7f317f6d4e4d580c1f5629f4f46defe272.zip
ssh: Add infinity as values to rekey_limit
Zero is removed from the Minutes in the new tuple value to remove a loop possibility. The zero is kept for bytes since that is not dangerous and a removal would be an unnecssary incompatibility.
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r--lib/ssh/doc/src/ssh.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 6aed525e8b..407956cc6f 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -762,6 +762,8 @@
<datatype>
<name name="rekey_limit_common_option"/>
+ <name name="limit_bytes"/>
+ <name name="limit_time"/>
<desc>
<p>Sets the limit when rekeying is to be initiated. Both the max time and max amount of data
could be configured:
@@ -773,6 +775,10 @@
</list>
<p>When a rekeying is done, both the timer and the byte counter are restarted.
Defaults to one hour and one GByte.</p>
+ <p>If <c>Minutes</c> is set to <c>infinity</c>, no rekeying will ever occur due to that max time has passed.
+ Setting <c>Bytes</c> to <c>infinity</c> will inhibit rekeying after a certain amount of data has been transferred.
+ If the option value is set to <c>{infinity, infinity}</c>, no rekeying will be initiated. Note that rekeying initiated
+ by the peer will still be performed.</p>
</desc>
</datatype>