summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--moduli.54
-rw-r--r--ssh-keygen.112
-rw-r--r--ssh.14
-rw-r--r--sshd.85
-rw-r--r--sshd_config.53
5 files changed, 13 insertions, 15 deletions
diff --git a/moduli.5 b/moduli.5
index ef0de0850..149846c8c 100644
--- a/moduli.5
+++ b/moduli.5
@@ -21,7 +21,7 @@
21.Nd Diffie-Hellman moduli 21.Nd Diffie-Hellman moduli
22.Sh DESCRIPTION 22.Sh DESCRIPTION
23The 23The
24.Pa /etc/moduli 24.Pa /etc/ssh/moduli
25file contains prime numbers and generators for use by 25file contains prime numbers and generators for use by
26.Xr sshd 8 26.Xr sshd 8
27in the Diffie-Hellman Group Exchange key exchange method. 27in the Diffie-Hellman Group Exchange key exchange method.
@@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough
110Diffie-Hellman output to sufficiently key the selected symmetric cipher. 110Diffie-Hellman output to sufficiently key the selected symmetric cipher.
111.Xr sshd 8 111.Xr sshd 8
112then randomly selects a modulus from 112then randomly selects a modulus from
113.Fa /etc/moduli 113.Fa /etc/ssh/moduli
114that best meets the size requirement. 114that best meets the size requirement.
115.Sh SEE ALSO 115.Sh SEE ALSO
116.Xr ssh-keygen 1 , 116.Xr ssh-keygen 1 ,
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index bfa2eb5f3..da6b5ed76 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -176,9 +176,7 @@ key in
176.Pa ~/.ssh/id_ed25519 176.Pa ~/.ssh/id_ed25519
177or 177or
178.Pa ~/.ssh/id_rsa . 178.Pa ~/.ssh/id_rsa .
179Additionally, the system administrator may use this to generate host keys, 179Additionally, the system administrator may use this to generate host keys.
180as seen in
181.Pa /etc/rc .
182.Pp 180.Pp
183Normally this program generates the key and asks for a file in which 181Normally this program generates the key and asks for a file in which
184to store the private key. 182to store the private key.
@@ -229,9 +227,7 @@ If
229.Fl f 227.Fl f
230has also been specified, its argument is used as a prefix to the 228has also been specified, its argument is used as a prefix to the
231default path for the resulting host key files. 229default path for the resulting host key files.
232This is used by 230This is used by system administration scripts to generate new host keys.
233.Pa /etc/rc
234to generate new host keys.
235.It Fl a Ar rounds 231.It Fl a Ar rounds
236When saving a private key this option specifies the number of KDF 232When saving a private key this option specifies the number of KDF
237(key derivation function) rounds used. 233(key derivation function) rounds used.
@@ -677,7 +673,7 @@ option.
677Valid generator values are 2, 3, and 5. 673Valid generator values are 2, 3, and 5.
678.Pp 674.Pp
679Screened DH groups may be installed in 675Screened DH groups may be installed in
680.Pa /etc/moduli . 676.Pa /etc/ssh/moduli .
681It is important that this file contains moduli of a range of bit lengths and 677It is important that this file contains moduli of a range of bit lengths and
682that both ends of a connection share common moduli. 678that both ends of a connection share common moduli.
683.Sh CERTIFICATES 679.Sh CERTIFICATES
@@ -877,7 +873,7 @@ on all machines
877where the user wishes to log in using public key authentication. 873where the user wishes to log in using public key authentication.
878There is no need to keep the contents of this file secret. 874There is no need to keep the contents of this file secret.
879.Pp 875.Pp
880.It Pa /etc/moduli 876.It Pa /etc/ssh/moduli
881Contains Diffie-Hellman groups used for DH-GEX. 877Contains Diffie-Hellman groups used for DH-GEX.
882The file format is described in 878The file format is described in
883.Xr moduli 5 . 879.Xr moduli 5 .
diff --git a/ssh.1 b/ssh.1
index 81f29af43..5dfad6daa 100644
--- a/ssh.1
+++ b/ssh.1
@@ -860,6 +860,10 @@ implements public key authentication protocol automatically,
860using one of the DSA, ECDSA, Ed25519 or RSA algorithms. 860using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
861The HISTORY section of 861The HISTORY section of
862.Xr ssl 8 862.Xr ssl 8
863(on non-OpenBSD systems, see
864.nh
865http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
866.hy
863contains a brief discussion of the DSA and RSA algorithms. 867contains a brief discussion of the DSA and RSA algorithms.
864.Pp 868.Pp
865The file 869The file
diff --git a/sshd.8 b/sshd.8
index 57a7fd66b..4abc01d66 100644
--- a/sshd.8
+++ b/sshd.8
@@ -65,7 +65,7 @@ over an insecure network.
65.Nm 65.Nm
66listens for connections from clients. 66listens for connections from clients.
67It is normally started at boot from 67It is normally started at boot from
68.Pa /etc/rc . 68.Pa /etc/init.d/ssh .
69It forks a new 69It forks a new
70daemon for each incoming connection. 70daemon for each incoming connection.
71The forked daemons handle 71The forked daemons handle
@@ -884,7 +884,7 @@ This file is for host-based authentication (see
884.Xr ssh 1 ) . 884.Xr ssh 1 ) .
885It should only be writable by root. 885It should only be writable by root.
886.Pp 886.Pp
887.It Pa /etc/moduli 887.It Pa /etc/ssh/moduli
888Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" 888Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
889key exchange method. 889key exchange method.
890The file format is described in 890The file format is described in
@@ -982,7 +982,6 @@ The content of this file is not sensitive; it can be world-readable.
982.Xr ssh-keyscan 1 , 982.Xr ssh-keyscan 1 ,
983.Xr chroot 2 , 983.Xr chroot 2 ,
984.Xr hosts_access 5 , 984.Xr hosts_access 5 ,
985.Xr login.conf 5 ,
986.Xr moduli 5 , 985.Xr moduli 5 ,
987.Xr sshd_config 5 , 986.Xr sshd_config 5 ,
988.Xr inetd 8 , 987.Xr inetd 8 ,
diff --git a/sshd_config.5 b/sshd_config.5
index 37e6be38f..23f71fd1d 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -395,8 +395,7 @@ Certificates signed using other algorithms will not be accepted for
395public key or host-based authentication. 395public key or host-based authentication.
396.It Cm ChallengeResponseAuthentication 396.It Cm ChallengeResponseAuthentication
397Specifies whether challenge-response authentication is allowed (e.g. via 397Specifies whether challenge-response authentication is allowed (e.g. via
398PAM or through authentication styles supported in 398PAM).
399.Xr login.conf 5 )
400The default is 399The default is
401.Cm yes . 400.Cm yes .
402.It Cm ChrootDirectory 401.It Cm ChrootDirectory