diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:09 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-10-18 12:07:21 +0100 |
commit | 6bcbfca92b58917dba48b696dd63529fa5dcbb82 (patch) | |
tree | bb41f5b2a536e322f8a488ad6afc4fd76df2ba5d | |
parent | 27ced5f6a3c5dec6e0a78ae138d3db56d49953bd (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 3ae596caa..836174fb6 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -202,9 +202,7 @@ key in | |||
202 | .Pa ~/.ssh/id_ed25519_sk | 202 | .Pa ~/.ssh/id_ed25519_sk |
203 | or | 203 | or |
204 | .Pa ~/.ssh/id_rsa . | 204 | .Pa ~/.ssh/id_rsa . |
205 | Additionally, the system administrator may use this to generate host keys, | 205 | Additionally, the system administrator may use this to generate host keys. |
206 | as seen in | ||
207 | .Pa /etc/rc . | ||
208 | .Pp | 206 | .Pp |
209 | Normally this program generates the key and asks for a file in which | 207 | Normally this program generates the key and asks for a file in which |
210 | to store the private key. | 208 | to store the private key. |
@@ -269,9 +267,7 @@ If | |||
269 | .Fl f | 267 | .Fl f |
270 | has also been specified, its argument is used as a prefix to the | 268 | has also been specified, its argument is used as a prefix to the |
271 | default path for the resulting host key files. | 269 | default path for the resulting host key files. |
272 | This is used by | 270 | This is used by system administration scripts to generate new host keys. |
273 | .Pa /etc/rc | ||
274 | to generate new host keys. | ||
275 | .It Fl a Ar rounds | 271 | .It Fl a Ar rounds |
276 | When saving a private key, this option specifies the number of KDF | 272 | When saving a private key, this option specifies the number of KDF |
277 | (key derivation function) rounds used. | 273 | (key derivation function) rounds used. |
@@ -804,7 +800,7 @@ option. | |||
804 | Valid generator values are 2, 3, and 5. | 800 | Valid generator values are 2, 3, and 5. |
805 | .Pp | 801 | .Pp |
806 | Screened DH groups may be installed in | 802 | Screened DH groups may be installed in |
807 | .Pa /etc/moduli . | 803 | .Pa /etc/ssh/moduli . |
808 | It is important that this file contains moduli of a range of bit lengths and | 804 | It is important that this file contains moduli of a range of bit lengths and |
809 | that both ends of a connection share common moduli. | 805 | that both ends of a connection share common moduli. |
810 | .Pp | 806 | .Pp |
@@ -1185,7 +1181,7 @@ on all machines | |||
1185 | where the user wishes to log in using public key authentication. | 1181 | where the user wishes to log in using public key authentication. |
1186 | There is no need to keep the contents of this file secret. | 1182 | There is no need to keep the contents of this file secret. |
1187 | .Pp | 1183 | .Pp |
1188 | .It Pa /etc/moduli | 1184 | .It Pa /etc/ssh/moduli |
1189 | Contains Diffie-Hellman groups used for DH-GEX. | 1185 | Contains Diffie-Hellman groups used for DH-GEX. |
1190 | The file format is described in | 1186 | The file format is described in |
1191 | .Xr moduli 5 . | 1187 | .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 |
@@ -911,7 +911,7 @@ This file is for host-based authentication (see | |||
911 | .Xr ssh 1 ) . | 911 | .Xr ssh 1 ) . |
912 | It should only be writable by root. | 912 | It should only be writable by root. |
913 | .Pp | 913 | .Pp |
914 | .It Pa /etc/moduli | 914 | .It Pa /etc/ssh/moduli |
915 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" | 915 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" |
916 | key exchange method. | 916 | key exchange method. |
917 | The file format is described in | 917 | The file format is described in |
@@ -1009,7 +1009,6 @@ The content of this file is not sensitive; it can be world-readable. | |||
1009 | .Xr ssh-keyscan 1 , | 1009 | .Xr ssh-keyscan 1 , |
1010 | .Xr chroot 2 , | 1010 | .Xr chroot 2 , |
1011 | .Xr hosts_access 5 , | 1011 | .Xr hosts_access 5 , |
1012 | .Xr login.conf 5 , | ||
1013 | .Xr moduli 5 , | 1012 | .Xr moduli 5 , |
1014 | .Xr sshd_config 5 , | 1013 | .Xr sshd_config 5 , |
1015 | .Xr inetd 8 , | 1014 | .Xr inetd 8 , |
diff --git a/sshd_config.5 b/sshd_config.5 index 33dc0c675..32ae46476 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 |