summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-09 16:10:09 +0000
committerColin Watson <cjwatson@debian.org>2018-04-03 08:26:37 +0100
commitaac4f0438e6fb33bbcda11e50483aa38f657d5f1 (patch)
treedf28569c3e716b5278881e5c2a7b932cc934e52e
parent35b042aaa143ac815ada8cd746ef95ab538af1a7 (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.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 3525d7d17..39767e621 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
177or 177or
178.Pa ~/.ssh/id_rsa . 178.Pa ~/.ssh/id_rsa .
179Additionally, the system administrator may use this to generate host keys, 179Additionally, the system administrator may use this to generate host keys.
180as seen in
181.Pa /etc/rc .
182.Pp 180.Pp
183Normally this program generates the key and asks for a file in which 181Normally this program generates the key and asks for a file in which
184to store the private key. 182to store the private key.
@@ -229,9 +227,7 @@ If
229.Fl f 227.Fl f
230has also been specified, its argument is used as a prefix to the 228has also been specified, its argument is used as a prefix to the
231default path for the resulting host key files. 229default path for the resulting host key files.
232This is used by 230This is used by system administration scripts to generate new host keys.
233.Pa /etc/rc
234to generate new host keys.
235.It Fl a Ar rounds 231.It Fl a Ar rounds
236When saving a new-format private key (i.e. an ed25519 key or when the 232When saving a new-format private key (i.e. an ed25519 key or when the
237.Fl o 233.Fl o
@@ -685,7 +681,7 @@ option.
685Valid generator values are 2, 3, and 5. 681Valid generator values are 2, 3, and 5.
686.Pp 682.Pp
687Screened DH groups may be installed in 683Screened DH groups may be installed in
688.Pa /etc/moduli . 684.Pa /etc/ssh/moduli .
689It is important that this file contains moduli of a range of bit lengths and 685It is important that this file contains moduli of a range of bit lengths and
690that both ends of a connection share common moduli. 686that both ends of a connection share common moduli.
691.Sh CERTIFICATES 687.Sh CERTIFICATES
@@ -872,7 +868,7 @@ on all machines
872where the user wishes to log in using public key authentication. 868where the user wishes to log in using public key authentication.
873There is no need to keep the contents of this file secret. 869There is no need to keep the contents of this file secret.
874.Pp 870.Pp
875.It Pa /etc/moduli 871.It Pa /etc/ssh/moduli
876Contains Diffie-Hellman groups used for DH-GEX. 872Contains Diffie-Hellman groups used for DH-GEX.
877The file format is described in 873The file format is described in
878.Xr moduli 5 . 874.Xr moduli 5 .
diff --git a/ssh.1 b/ssh.1
index 0ef7c1709..54e21d88a 100644
--- a/ssh.1
+++ b/ssh.1
@@ -846,6 +846,10 @@ implements public key authentication protocol automatically,
846using one of the DSA, ECDSA, Ed25519 or RSA algorithms. 846using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
847The HISTORY section of 847The HISTORY section of
848.Xr ssl 8 848.Xr ssl 8
849(on non-OpenBSD systems, see
850.nh
851http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
852.hy
849contains a brief discussion of the DSA and RSA algorithms. 853contains a brief discussion of the DSA and RSA algorithms.
850.Pp 854.Pp
851The file 855The file
diff --git a/sshd.8 b/sshd.8
index c8299d5e5..378aeb9f5 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
@@ -856,7 +856,7 @@ This file is for host-based authentication (see
856.Xr ssh 1 ) . 856.Xr ssh 1 ) .
857It should only be writable by root. 857It should only be writable by root.
858.Pp 858.Pp
859.It Pa /etc/moduli 859.It Pa /etc/ssh/moduli
860Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" 860Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
861key exchange method. 861key exchange method.
862The file format is described in 862The file format is described in
@@ -954,7 +954,6 @@ The content of this file is not sensitive; it can be world-readable.
954.Xr ssh-keyscan 1 , 954.Xr ssh-keyscan 1 ,
955.Xr chroot 2 , 955.Xr chroot 2 ,
956.Xr hosts_access 5 , 956.Xr hosts_access 5 ,
957.Xr login.conf 5 ,
958.Xr moduli 5 , 957.Xr moduli 5 ,
959.Xr sshd_config 5 , 958.Xr sshd_config 5 ,
960.Xr inetd 8 , 959.Xr inetd 8 ,
diff --git a/sshd_config.5 b/sshd_config.5
index 45044a70f..44b918463 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -383,8 +383,7 @@ then no banner is displayed.
383By default, no banner is displayed. 383By default, no banner is displayed.
384.It Cm ChallengeResponseAuthentication 384.It Cm ChallengeResponseAuthentication
385Specifies whether challenge-response authentication is allowed (e.g. via 385Specifies whether challenge-response authentication is allowed (e.g. via
386PAM or through authentication styles supported in 386PAM).
387.Xr login.conf 5 )
388The default is 387The default is
389.Cm yes . 388.Cm yes .
390.It Cm ChrootDirectory 389.It Cm ChrootDirectory