diff options
-rw-r--r-- | moduli.5 | 4 | ||||
-rw-r--r-- | ssh-keygen.1 | 12 | ||||
-rw-r--r-- | ssh.1 | 4 | ||||
-rw-r--r-- | sshd.8 | 5 | ||||
-rw-r--r-- | sshd_config.5 | 3 |
5 files changed, 13 insertions, 15 deletions
@@ -21,7 +21,7 @@ | |||
21 | .Nd Diffie-Hellman moduli | 21 | .Nd Diffie-Hellman moduli |
22 | .Sh DESCRIPTION | 22 | .Sh DESCRIPTION |
23 | The | 23 | The |
24 | .Pa /etc/moduli | 24 | .Pa /etc/ssh/moduli |
25 | file contains prime numbers and generators for use by | 25 | file contains prime numbers and generators for use by |
26 | .Xr sshd 8 | 26 | .Xr sshd 8 |
27 | in the Diffie-Hellman Group Exchange key exchange method. | 27 | in the Diffie-Hellman Group Exchange key exchange method. |
@@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough | |||
110 | Diffie-Hellman output to sufficiently key the selected symmetric cipher. | 110 | Diffie-Hellman output to sufficiently key the selected symmetric cipher. |
111 | .Xr sshd 8 | 111 | .Xr sshd 8 |
112 | then randomly selects a modulus from | 112 | then randomly selects a modulus from |
113 | .Fa /etc/moduli | 113 | .Fa /etc/ssh/moduli |
114 | that best meets the size requirement. | 114 | that 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 723a0162e..79b948c8b 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -172,9 +172,7 @@ key in | |||
172 | .Pa ~/.ssh/id_ed25519 | 172 | .Pa ~/.ssh/id_ed25519 |
173 | or | 173 | or |
174 | .Pa ~/.ssh/id_rsa . | 174 | .Pa ~/.ssh/id_rsa . |
175 | Additionally, the system administrator may use this to generate host keys, | 175 | Additionally, the system administrator may use this to generate host keys. |
176 | as seen in | ||
177 | .Pa /etc/rc . | ||
178 | .Pp | 176 | .Pp |
179 | Normally this program generates the key and asks for a file in which | 177 | Normally this program generates the key and asks for a file in which |
180 | to store the private key. | 178 | to store the private key. |
@@ -221,9 +219,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) | |||
221 | for which host keys | 219 | for which host keys |
222 | do not exist, generate the host keys with the default key file path, | 220 | do not exist, generate the host keys with the default key file path, |
223 | an empty passphrase, default bits for the key type, and default comment. | 221 | an empty passphrase, default bits for the key type, and default comment. |
224 | This is used by | 222 | This is used by system administration scripts to generate new host keys. |
225 | .Pa /etc/rc | ||
226 | to generate new host keys. | ||
227 | .It Fl a Ar rounds | 223 | .It Fl a Ar rounds |
228 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol | 224 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol |
229 | 2 key when the | 225 | 2 key when the |
@@ -628,7 +624,7 @@ option. | |||
628 | Valid generator values are 2, 3, and 5. | 624 | Valid generator values are 2, 3, and 5. |
629 | .Pp | 625 | .Pp |
630 | Screened DH groups may be installed in | 626 | Screened DH groups may be installed in |
631 | .Pa /etc/moduli . | 627 | .Pa /etc/ssh/moduli . |
632 | It is important that this file contains moduli of a range of bit lengths and | 628 | It is important that this file contains moduli of a range of bit lengths and |
633 | that both ends of a connection share common moduli. | 629 | that both ends of a connection share common moduli. |
634 | .Sh CERTIFICATES | 630 | .Sh CERTIFICATES |
@@ -827,7 +823,7 @@ on all machines | |||
827 | where the user wishes to log in using public key authentication. | 823 | where the user wishes to log in using public key authentication. |
828 | There is no need to keep the contents of this file secret. | 824 | There is no need to keep the contents of this file secret. |
829 | .Pp | 825 | .Pp |
830 | .It Pa /etc/moduli | 826 | .It Pa /etc/ssh/moduli |
831 | Contains Diffie-Hellman groups used for DH-GEX. | 827 | Contains Diffie-Hellman groups used for DH-GEX. |
832 | The file format is described in | 828 | The file format is described in |
833 | .Xr moduli 5 . | 829 | .Xr moduli 5 . |
@@ -753,6 +753,10 @@ Protocol 1 is restricted to using only RSA keys, | |||
753 | but protocol 2 may use any. | 753 | but protocol 2 may use any. |
754 | The HISTORY section of | 754 | The HISTORY section of |
755 | .Xr ssl 8 | 755 | .Xr ssl 8 |
756 | (on non-OpenBSD systems, see | ||
757 | .nh | ||
758 | http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
759 | .hy | ||
756 | contains a brief discussion of the DSA and RSA algorithms. | 760 | contains a brief discussion of the DSA and RSA algorithms. |
757 | .Pp | 761 | .Pp |
758 | The file | 762 | The file |
@@ -67,7 +67,7 @@ over an insecure network. | |||
67 | .Nm | 67 | .Nm |
68 | listens for connections from clients. | 68 | listens for connections from clients. |
69 | It is normally started at boot from | 69 | It is normally started at boot from |
70 | .Pa /etc/rc . | 70 | .Pa /etc/init.d/ssh . |
71 | It forks a new | 71 | It forks a new |
72 | daemon for each incoming connection. | 72 | daemon for each incoming connection. |
73 | The forked daemons handle | 73 | The forked daemons handle |
@@ -862,7 +862,7 @@ This file is for host-based authentication (see | |||
862 | .Xr ssh 1 ) . | 862 | .Xr ssh 1 ) . |
863 | It should only be writable by root. | 863 | It should only be writable by root. |
864 | .Pp | 864 | .Pp |
865 | .It Pa /etc/moduli | 865 | .It Pa /etc/ssh/moduli |
866 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". | 866 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". |
867 | The file format is described in | 867 | The file format is described in |
868 | .Xr moduli 5 . | 868 | .Xr moduli 5 . |
@@ -961,7 +961,6 @@ The content of this file is not sensitive; it can be world-readable. | |||
961 | .Xr ssh-keyscan 1 , | 961 | .Xr ssh-keyscan 1 , |
962 | .Xr chroot 2 , | 962 | .Xr chroot 2 , |
963 | .Xr hosts_access 5 , | 963 | .Xr hosts_access 5 , |
964 | .Xr login.conf 5 , | ||
965 | .Xr moduli 5 , | 964 | .Xr moduli 5 , |
966 | .Xr sshd_config 5 , | 965 | .Xr sshd_config 5 , |
967 | .Xr inetd 8 , | 966 | .Xr inetd 8 , |
diff --git a/sshd_config.5 b/sshd_config.5 index 58997d3fe..7396b238c 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -303,8 +303,7 @@ This option is only available for protocol version 2. | |||
303 | By default, no banner is displayed. | 303 | By default, no banner is displayed. |
304 | .It Cm ChallengeResponseAuthentication | 304 | .It Cm ChallengeResponseAuthentication |
305 | Specifies whether challenge-response authentication is allowed (e.g. via | 305 | Specifies whether challenge-response authentication is allowed (e.g. via |
306 | PAM or through authentication styles supported in | 306 | PAM). |
307 | .Xr login.conf 5 ) | ||
308 | The default is | 307 | The default is |
309 | .Dq yes . | 308 | .Dq yes . |
310 | .It Cm ChrootDirectory | 309 | .It Cm ChrootDirectory |