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 ce2213c78..01711dfff 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.
@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
227for which host keys 225for which host keys
228do not exist, generate the host keys with the default key file path, 226do not exist, generate the host keys with the default key file path,
229an empty passphrase, default bits for the key type, and default comment. 227an empty passphrase, default bits for the key type, and default comment.
230This is used by 228This is used by system administration scripts to generate new host keys.
231.Pa /etc/rc
232to generate new host keys.
233.It Fl a Ar rounds 229.It Fl a Ar rounds
234When saving a new-format private key (i.e. an ed25519 key or any SSH protocol 230When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
2352 key when the 2312 key when the
@@ -644,7 +640,7 @@ option.
644Valid generator values are 2, 3, and 5. 640Valid generator values are 2, 3, and 5.
645.Pp 641.Pp
646Screened DH groups may be installed in 642Screened DH groups may be installed in
647.Pa /etc/moduli . 643.Pa /etc/ssh/moduli .
648It is important that this file contains moduli of a range of bit lengths and 644It is important that this file contains moduli of a range of bit lengths and
649that both ends of a connection share common moduli. 645that both ends of a connection share common moduli.
650.Sh CERTIFICATES 646.Sh CERTIFICATES
@@ -843,7 +839,7 @@ on all machines
843where the user wishes to log in using public key authentication. 839where the user wishes to log in using public key authentication.
844There is no need to keep the contents of this file secret. 840There is no need to keep the contents of this file secret.
845.Pp 841.Pp
846.It Pa /etc/moduli 842.It Pa /etc/ssh/moduli
847Contains Diffie-Hellman groups used for DH-GEX. 843Contains Diffie-Hellman groups used for DH-GEX.
848The file format is described in 844The file format is described in
849.Xr moduli 5 . 845.Xr moduli 5 .
diff --git a/ssh.1 b/ssh.1
index feef81a54..b1f128c25 100644
--- a/ssh.1
+++ b/ssh.1
@@ -877,6 +877,10 @@ implements public key authentication protocol automatically,
877using one of the DSA, ECDSA, Ed25519 or RSA algorithms. 877using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
878The HISTORY section of 878The HISTORY section of
879.Xr ssl 8 879.Xr ssl 8
880(on non-OpenBSD systems, see
881.nh
882http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
883.hy
880contains a brief discussion of the DSA and RSA algorithms. 884contains a brief discussion of the DSA and RSA algorithms.
881.Pp 885.Pp
882The file 886The file
diff --git a/sshd.8 b/sshd.8
index c67846025..e69151414 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
@@ -836,7 +836,7 @@ This file is for host-based authentication (see
836.Xr ssh 1 ) . 836.Xr ssh 1 ) .
837It should only be writable by root. 837It should only be writable by root.
838.Pp 838.Pp
839.It Pa /etc/moduli 839.It Pa /etc/ssh/moduli
840Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" 840Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
841key exchange method. 841key exchange method.
842The file format is described in 842The file format is described in
@@ -936,7 +936,6 @@ The content of this file is not sensitive; it can be world-readable.
936.Xr ssh-keyscan 1 , 936.Xr ssh-keyscan 1 ,
937.Xr chroot 2 , 937.Xr chroot 2 ,
938.Xr hosts_access 5 , 938.Xr hosts_access 5 ,
939.Xr login.conf 5 ,
940.Xr moduli 5 , 939.Xr moduli 5 ,
941.Xr sshd_config 5 , 940.Xr sshd_config 5 ,
942.Xr inetd 8 , 941.Xr inetd 8 ,
diff --git a/sshd_config.5 b/sshd_config.5
index 4ea0a9c34..e45a89372 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -372,8 +372,7 @@ then no banner is displayed.
372By default, no banner is displayed. 372By default, no banner is displayed.
373.It Cm ChallengeResponseAuthentication 373.It Cm ChallengeResponseAuthentication
374Specifies whether challenge-response authentication is allowed (e.g. via 374Specifies whether challenge-response authentication is allowed (e.g. via
375PAM or through authentication styles supported in 375PAM).
376.Xr login.conf 5 )
377The default is 376The default is
378.Cm yes . 377.Cm yes .
379.It Cm ChrootDirectory 378.It Cm ChrootDirectory