diff options
| author | Hans Nilsson <[email protected]> | 2018-05-14 12:27:59 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-14 12:27:59 +0200 |
| commit | 6454f3b15bd1c260017c250915d45ba77ee86c4f (patch) | |
| tree | 9df5246535aa31228db20f396f626b0b9413841f /lib/ssh/doc | |
| parent | f97a29930f6a192d06c053ebd88d4abe7e45beb8 (diff) | |
| parent | c9f0a6ed11d42d461aeb4f29e4b3c900df3fed98 (diff) | |
| download | otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.tar.gz otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.tar.bz2 otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.zip | |
Merge branch 'hans/ssh/rekey_limit/OTP-15069'
* hans/ssh/rekey_limit/OTP-15069:
ssh: Test the infinity rekey_limit option
ssh: Add infinity as values to rekey_limit
Diffstat (limited to 'lib/ssh/doc')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 6 |
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> |