aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-02 08:45:56 +0200
committerHans Nilsson <[email protected]>2015-10-02 08:45:56 +0200
commit0b082b4943bdf5bb9bbefdb956df767fde1bd001 (patch)
tree098ccb60d2887a324f07aac82d1f7d8a226558e3 /lib/ssh/doc
parentadc4d63f2c2e14d8646928347887aff95b1ffdcd (diff)
parentc31a42fe95c06d4f491424a42fc7c90f94fe5801 (diff)
downloadotp-0b082b4943bdf5bb9bbefdb956df767fde1bd001.tar.gz
otp-0b082b4943bdf5bb9bbefdb956df767fde1bd001.tar.bz2
otp-0b082b4943bdf5bb9bbefdb956df767fde1bd001.zip
Merge branch 'hans/ssh/doc_dh-gex_defaults' into maint
* hans/ssh/doc_dh-gex_defaults: ssh: document dh-gex default values
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/ssh.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 6c95fa3399..293d618eed 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -243,7 +243,7 @@ kex is implicit but public_key is set explicitly.</p>
<tag><c><![CDATA[{dh_gex_limits,{Min=integer(),I=integer(),Max=integer()}}]]></c></tag>
<item>
<p>Sets the three diffie-hellman-group-exchange parameters that guides the connected server in choosing a group.
- See RFC 4419 for the function of thoose. The default value is <c>{512, 1024, 4096}</c>.
+ See RFC 4419 for the function of thoose. The default value is <c>{1024, 6144, 8192}</c>.
</p>
</item>