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 5f1ec09b0..dfbc65ddb 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 |
177 | or | 177 | or |
178 | .Pa ~/.ssh/id_rsa . | 178 | .Pa ~/.ssh/id_rsa . |
179 | Additionally, the system administrator may use this to generate host keys, | 179 | Additionally, the system administrator may use this to generate host keys. |
180 | as seen in | ||
181 | .Pa /etc/rc . | ||
182 | .Pp | 180 | .Pp |
183 | Normally this program generates the key and asks for a file in which | 181 | Normally this program generates the key and asks for a file in which |
184 | to store the private key. | 182 | to store the private key. |
@@ -229,9 +227,7 @@ If | |||
229 | .Fl f | 227 | .Fl f |
230 | has also been specified, its argument is used as a prefix to the | 228 | has also been specified, its argument is used as a prefix to the |
231 | default path for the resulting host key files. | 229 | default path for the resulting host key files. |
232 | This is used by | 230 | This is used by system administration scripts to generate new host keys. |
233 | .Pa /etc/rc | ||
234 | to generate new host keys. | ||
235 | .It Fl a Ar rounds | 231 | .It Fl a Ar rounds |
236 | When saving a new-format private key (i.e. an ed25519 key or when the | 232 | When saving a new-format private key (i.e. an ed25519 key or when the |
237 | .Fl o | 233 | .Fl o |
@@ -676,7 +672,7 @@ option. | |||
676 | Valid generator values are 2, 3, and 5. | 672 | Valid generator values are 2, 3, and 5. |
677 | .Pp | 673 | .Pp |
678 | Screened DH groups may be installed in | 674 | Screened DH groups may be installed in |
679 | .Pa /etc/moduli . | 675 | .Pa /etc/ssh/moduli . |
680 | It is important that this file contains moduli of a range of bit lengths and | 676 | It is important that this file contains moduli of a range of bit lengths and |
681 | that both ends of a connection share common moduli. | 677 | that both ends of a connection share common moduli. |
682 | .Sh CERTIFICATES | 678 | .Sh CERTIFICATES |
@@ -863,7 +859,7 @@ on all machines | |||
863 | where the user wishes to log in using public key authentication. | 859 | where the user wishes to log in using public key authentication. |
864 | There is no need to keep the contents of this file secret. | 860 | There is no need to keep the contents of this file secret. |
865 | .Pp | 861 | .Pp |
866 | .It Pa /etc/moduli | 862 | .It Pa /etc/ssh/moduli |
867 | Contains Diffie-Hellman groups used for DH-GEX. | 863 | Contains Diffie-Hellman groups used for DH-GEX. |
868 | The file format is described in | 864 | The file format is described in |
869 | .Xr moduli 5 . | 865 | .Xr moduli 5 . |
@@ -842,6 +842,10 @@ implements public key authentication protocol automatically, | |||
842 | using one of the DSA, ECDSA, Ed25519 or RSA algorithms. | 842 | using one of the DSA, ECDSA, Ed25519 or RSA algorithms. |
843 | The HISTORY section of | 843 | The HISTORY section of |
844 | .Xr ssl 8 | 844 | .Xr ssl 8 |
845 | (on non-OpenBSD systems, see | ||
846 | .nh | ||
847 | http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
848 | .hy | ||
845 | contains a brief discussion of the DSA and RSA algorithms. | 849 | contains a brief discussion of the DSA and RSA algorithms. |
846 | .Pp | 850 | .Pp |
847 | The file | 851 | The file |
@@ -65,7 +65,7 @@ over an insecure network. | |||
65 | .Nm | 65 | .Nm |
66 | listens for connections from clients. | 66 | listens for connections from clients. |
67 | It is normally started at boot from | 67 | It is normally started at boot from |
68 | .Pa /etc/rc . | 68 | .Pa /etc/init.d/ssh . |
69 | It forks a new | 69 | It forks a new |
70 | daemon for each incoming connection. | 70 | daemon for each incoming connection. |
71 | The forked daemons handle | 71 | The forked daemons handle |
@@ -850,7 +850,7 @@ This file is for host-based authentication (see | |||
850 | .Xr ssh 1 ) . | 850 | .Xr ssh 1 ) . |
851 | It should only be writable by root. | 851 | It should only be writable by root. |
852 | .Pp | 852 | .Pp |
853 | .It Pa /etc/moduli | 853 | .It Pa /etc/ssh/moduli |
854 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" | 854 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" |
855 | key exchange method. | 855 | key exchange method. |
856 | The file format is described in | 856 | The file format is described in |
@@ -950,7 +950,6 @@ The content of this file is not sensitive; it can be world-readable. | |||
950 | .Xr ssh-keyscan 1 , | 950 | .Xr ssh-keyscan 1 , |
951 | .Xr chroot 2 , | 951 | .Xr chroot 2 , |
952 | .Xr hosts_access 5 , | 952 | .Xr hosts_access 5 , |
953 | .Xr login.conf 5 , | ||
954 | .Xr moduli 5 , | 953 | .Xr moduli 5 , |
955 | .Xr sshd_config 5 , | 954 | .Xr sshd_config 5 , |
956 | .Xr inetd 8 , | 955 | .Xr inetd 8 , |
diff --git a/sshd_config.5 b/sshd_config.5 index 41e8c9399..79676a955 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -382,8 +382,7 @@ then no banner is displayed. | |||
382 | By default, no banner is displayed. | 382 | By default, no banner is displayed. |
383 | .It Cm ChallengeResponseAuthentication | 383 | .It Cm ChallengeResponseAuthentication |
384 | Specifies whether challenge-response authentication is allowed (e.g. via | 384 | Specifies whether challenge-response authentication is allowed (e.g. via |
385 | PAM or through authentication styles supported in | 385 | PAM). |
386 | .Xr login.conf 5 ) | ||
387 | The default is | 386 | The default is |
388 | .Cm yes . | 387 | .Cm yes . |
389 | .It Cm ChrootDirectory | 388 | .It Cm ChrootDirectory |