diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:09 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:25:35 +0100 |
commit | 34bf12a8e8fcc7720168dac307ef9388af93b947 (patch) | |
tree | 789113029293f9cebb7501e17bc4621429b6fdb2 | |
parent | eb51213d1bdc8d80cd7d0578737d8a7bfde992d2 (diff) |
Adjust various OpenBSD-specific references in manual pages
No single bug reference for this patch, but history includes:
http://bugs.debian.org/154434 (login.conf(5))
http://bugs.debian.org/513417 (/etc/rc)
http://bugs.debian.org/530692 (ssl(8))
https://bugs.launchpad.net/bugs/456660 (ssl(8))
Forwarded: not-needed
Last-Update: 2017-10-04
Patch-Name: openbsd-docs.patch
-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 059c1b034..45866f931 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -197,9 +197,7 @@ key in | |||
197 | .Pa ~/.ssh/id_ed25519_sk | 197 | .Pa ~/.ssh/id_ed25519_sk |
198 | or | 198 | or |
199 | .Pa ~/.ssh/id_rsa . | 199 | .Pa ~/.ssh/id_rsa . |
200 | Additionally, the system administrator may use this to generate host keys, | 200 | Additionally, the system administrator may use this to generate host keys. |
201 | as seen in | ||
202 | .Pa /etc/rc . | ||
203 | .Pp | 201 | .Pp |
204 | Normally this program generates the key and asks for a file in which | 202 | Normally this program generates the key and asks for a file in which |
205 | to store the private key. | 203 | to store the private key. |
@@ -262,9 +260,7 @@ If | |||
262 | .Fl f | 260 | .Fl f |
263 | has also been specified, its argument is used as a prefix to the | 261 | has also been specified, its argument is used as a prefix to the |
264 | default path for the resulting host key files. | 262 | default path for the resulting host key files. |
265 | This is used by | 263 | This is used by system administration scripts to generate new host keys. |
266 | .Pa /etc/rc | ||
267 | to generate new host keys. | ||
268 | .It Fl a Ar rounds | 264 | .It Fl a Ar rounds |
269 | When saving a private key, this option specifies the number of KDF | 265 | When saving a private key, this option specifies the number of KDF |
270 | (key derivation function) rounds used. | 266 | (key derivation function) rounds used. |
@@ -787,7 +783,7 @@ option. | |||
787 | Valid generator values are 2, 3, and 5. | 783 | Valid generator values are 2, 3, and 5. |
788 | .Pp | 784 | .Pp |
789 | Screened DH groups may be installed in | 785 | Screened DH groups may be installed in |
790 | .Pa /etc/moduli . | 786 | .Pa /etc/ssh/moduli . |
791 | It is important that this file contains moduli of a range of bit lengths and | 787 | It is important that this file contains moduli of a range of bit lengths and |
792 | that both ends of a connection share common moduli. | 788 | that both ends of a connection share common moduli. |
793 | .Pp | 789 | .Pp |
@@ -1158,7 +1154,7 @@ on all machines | |||
1158 | where the user wishes to log in using public key authentication. | 1154 | where the user wishes to log in using public key authentication. |
1159 | There is no need to keep the contents of this file secret. | 1155 | There is no need to keep the contents of this file secret. |
1160 | .Pp | 1156 | .Pp |
1161 | .It Pa /etc/moduli | 1157 | .It Pa /etc/ssh/moduli |
1162 | Contains Diffie-Hellman groups used for DH-GEX. | 1158 | Contains Diffie-Hellman groups used for DH-GEX. |
1163 | The file format is described in | 1159 | The file format is described in |
1164 | .Xr moduli 5 . | 1160 | .Xr moduli 5 . |
@@ -890,6 +890,10 @@ implements public key authentication protocol automatically, | |||
890 | using one of the DSA, ECDSA, Ed25519 or RSA algorithms. | 890 | using one of the DSA, ECDSA, Ed25519 or RSA algorithms. |
891 | The HISTORY section of | 891 | The HISTORY section of |
892 | .Xr ssl 8 | 892 | .Xr ssl 8 |
893 | (on non-OpenBSD systems, see | ||
894 | .nh | ||
895 | http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
896 | .hy | ||
893 | contains a brief discussion of the DSA and RSA algorithms. | 897 | contains a brief discussion of the DSA and RSA algorithms. |
894 | .Pp | 898 | .Pp |
895 | The file | 899 | 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 |
@@ -904,7 +904,7 @@ This file is for host-based authentication (see | |||
904 | .Xr ssh 1 ) . | 904 | .Xr ssh 1 ) . |
905 | It should only be writable by root. | 905 | It should only be writable by root. |
906 | .Pp | 906 | .Pp |
907 | .It Pa /etc/moduli | 907 | .It Pa /etc/ssh/moduli |
908 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" | 908 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" |
909 | key exchange method. | 909 | key exchange method. |
910 | The file format is described in | 910 | The file format is described in |
@@ -1002,7 +1002,6 @@ The content of this file is not sensitive; it can be world-readable. | |||
1002 | .Xr ssh-keyscan 1 , | 1002 | .Xr ssh-keyscan 1 , |
1003 | .Xr chroot 2 , | 1003 | .Xr chroot 2 , |
1004 | .Xr hosts_access 5 , | 1004 | .Xr hosts_access 5 , |
1005 | .Xr login.conf 5 , | ||
1006 | .Xr moduli 5 , | 1005 | .Xr moduli 5 , |
1007 | .Xr sshd_config 5 , | 1006 | .Xr sshd_config 5 , |
1008 | .Xr inetd 8 , | 1007 | .Xr inetd 8 , |
diff --git a/sshd_config.5 b/sshd_config.5 index 753ceda10..c27f99937 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -385,8 +385,7 @@ Certificates signed using other algorithms will not be accepted for | |||
385 | public key or host-based authentication. | 385 | public key or host-based authentication. |
386 | .It Cm ChallengeResponseAuthentication | 386 | .It Cm ChallengeResponseAuthentication |
387 | Specifies whether challenge-response authentication is allowed (e.g. via | 387 | Specifies whether challenge-response authentication is allowed (e.g. via |
388 | PAM or through authentication styles supported in | 388 | PAM). |
389 | .Xr login.conf 5 ) | ||
390 | The default is | 389 | The default is |
391 | .Cm yes . | 390 | .Cm yes . |
392 | .It Cm ChrootDirectory | 391 | .It Cm ChrootDirectory |