aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-23 18:33:05 +0200
committerHans Nilsson <[email protected]>2015-11-04 12:10:06 +0100
commit961bb51d1b73c6ff2ad5f08e0a4c13fbfc2fbb98 (patch)
treeb71404f6e2fc8d5369667275ee5769675c2a32c2 /lib/ssh/doc/src
parentc50a9a6562a14f3a9fbd2071e3b19eed8c9c9b4b (diff)
downloadotp-961bb51d1b73c6ff2ad5f08e0a4c13fbfc2fbb98.tar.gz
otp-961bb51d1b73c6ff2ad5f08e0a4c13fbfc2fbb98.tar.bz2
otp-961bb51d1b73c6ff2ad5f08e0a4c13fbfc2fbb98.zip
ssh: option dh_gex_groups with tag ssh_moduli_file
Makes this existing option also accept a file in openssh format OTP-13052
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 66f872490c..1e4dd91eb6 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -462,7 +462,7 @@ kex is implicit but public_key is set explicitly.</p>
</warning>
</item>
- <tag><c><![CDATA[{dh_gex_groups, [{Size=integer(),G=integer(),P=integer()}] | {file,filename()} }]]></c></tag>
+ <tag><c><![CDATA[{dh_gex_groups, [{Size=integer(),G=integer(),P=integer()}] | {file,filename()} {ssh_moduli_file,filename()} }]]></c></tag>
<item>
<p>Sets the groups that the server may choose among when diffie-hellman-group-exchange is negotiated.
See RFC 4419 for details.
@@ -471,6 +471,8 @@ kex is implicit but public_key is set explicitly.</p>
</p>
<p>If the parameter is <c>{file,filename()}</c>, the file must exist and have one or more three-tuples terminated by a dot. The interpretation is as if the tuples had been given directly in the option. The file is read when the daemon starts.
</p>
+ <p>If the parameter is <c>{ssh_moduli_file,filename()}</c>, the file must exist and be in ssh-keygen moduli file format. The file is read when the daemon starts.
+ </p>
</item>
<tag><c><![CDATA[{pwdfun, fun(User::string(), password::string()) -> boolean()}]]></c></tag>