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 124456577..9b877b860 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -178,9 +178,7 @@ key in
178.Pa ~/.ssh/id_ed25519 178.Pa ~/.ssh/id_ed25519
179or 179or
180.Pa ~/.ssh/id_rsa . 180.Pa ~/.ssh/id_rsa .
181Additionally, the system administrator may use this to generate host keys, 181Additionally, the system administrator may use this to generate host keys.
182as seen in
183.Pa /etc/rc .
184.Pp 182.Pp
185Normally this program generates the key and asks for a file in which 183Normally this program generates the key and asks for a file in which
186to store the private key. 184to store the private key.
@@ -243,9 +241,7 @@ If
243.Fl f 241.Fl f
244has also been specified, its argument is used as a prefix to the 242has also been specified, its argument is used as a prefix to the
245default path for the resulting host key files. 243default path for the resulting host key files.
246This is used by 244This is used by system administration scripts to generate new host keys.
247.Pa /etc/rc
248to generate new host keys.
249.It Fl a Ar rounds 245.It Fl a Ar rounds
250When saving a private key this option specifies the number of KDF 246When saving a private key this option specifies the number of KDF
251(key derivation function) rounds used. 247(key derivation function) rounds used.
@@ -703,7 +699,7 @@ option.
703Valid generator values are 2, 3, and 5. 699Valid generator values are 2, 3, and 5.
704.Pp 700.Pp
705Screened DH groups may be installed in 701Screened DH groups may be installed in
706.Pa /etc/moduli . 702.Pa /etc/ssh/moduli .
707It is important that this file contains moduli of a range of bit lengths and 703It is important that this file contains moduli of a range of bit lengths and
708that both ends of a connection share common moduli. 704that both ends of a connection share common moduli.
709.Sh CERTIFICATES 705.Sh CERTIFICATES
@@ -903,7 +899,7 @@ on all machines
903where the user wishes to log in using public key authentication. 899where the user wishes to log in using public key authentication.
904There is no need to keep the contents of this file secret. 900There is no need to keep the contents of this file secret.
905.Pp 901.Pp
906.It Pa /etc/moduli 902.It Pa /etc/ssh/moduli
907Contains Diffie-Hellman groups used for DH-GEX. 903Contains Diffie-Hellman groups used for DH-GEX.
908The file format is described in 904The file format is described in
909.Xr moduli 5 . 905.Xr moduli 5 .
diff --git a/ssh.1 b/ssh.1
index 64ead5f57..e4aeae7b4 100644
--- a/ssh.1
+++ b/ssh.1
@@ -873,6 +873,10 @@ implements public key authentication protocol automatically,
873using one of the DSA, ECDSA, Ed25519 or RSA algorithms. 873using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
874The HISTORY section of 874The HISTORY section of
875.Xr ssl 8 875.Xr ssl 8
876(on non-OpenBSD systems, see
877.nh
878http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
879.hy
876contains a brief discussion of the DSA and RSA algorithms. 880contains a brief discussion of the DSA and RSA algorithms.
877.Pp 881.Pp
878The file 882The 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 addea54a0..f995e4ab0 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