mirror of https://gitee.com/openkylin/openssh.git
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 Gbp-Pq: Name openbsd-docs.patch
This commit is contained in:
parent
a7c9c362e4
commit
4141149348
4
moduli.5
4
moduli.5
|
@ -21,7 +21,7 @@
|
||||||
.Nd Diffie-Hellman moduli
|
.Nd Diffie-Hellman moduli
|
||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
The
|
The
|
||||||
.Pa /etc/moduli
|
.Pa /etc/ssh/moduli
|
||||||
file contains prime numbers and generators for use by
|
file contains prime numbers and generators for use by
|
||||||
.Xr sshd 8
|
.Xr sshd 8
|
||||||
in the Diffie-Hellman Group Exchange key exchange method.
|
in the Diffie-Hellman Group Exchange key exchange method.
|
||||||
|
@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough
|
||||||
Diffie-Hellman output to sufficiently key the selected symmetric cipher.
|
Diffie-Hellman output to sufficiently key the selected symmetric cipher.
|
||||||
.Xr sshd 8
|
.Xr sshd 8
|
||||||
then randomly selects a modulus from
|
then randomly selects a modulus from
|
||||||
.Fa /etc/moduli
|
.Fa /etc/ssh/moduli
|
||||||
that best meets the size requirement.
|
that best meets the size requirement.
|
||||||
.Sh SEE ALSO
|
.Sh SEE ALSO
|
||||||
.Xr ssh-keygen 1 ,
|
.Xr ssh-keygen 1 ,
|
||||||
|
|
12
ssh-keygen.1
12
ssh-keygen.1
|
@ -196,9 +196,7 @@ key in
|
||||||
.Pa ~/.ssh/id_ed25519_sk
|
.Pa ~/.ssh/id_ed25519_sk
|
||||||
or
|
or
|
||||||
.Pa ~/.ssh/id_rsa .
|
.Pa ~/.ssh/id_rsa .
|
||||||
Additionally, the system administrator may use this to generate host keys,
|
Additionally, the system administrator may use this to generate host keys.
|
||||||
as seen in
|
|
||||||
.Pa /etc/rc .
|
|
||||||
.Pp
|
.Pp
|
||||||
Normally this program generates the key and asks for a file in which
|
Normally this program generates the key and asks for a file in which
|
||||||
to store the private key.
|
to store the private key.
|
||||||
|
@ -261,9 +259,7 @@ If
|
||||||
.Fl f
|
.Fl f
|
||||||
has also been specified, its argument is used as a prefix to the
|
has also been specified, its argument is used as a prefix to the
|
||||||
default path for the resulting host key files.
|
default path for the resulting host key files.
|
||||||
This is used by
|
This is used by system administration scripts to generate new host keys.
|
||||||
.Pa /etc/rc
|
|
||||||
to generate new host keys.
|
|
||||||
.It Fl a Ar rounds
|
.It Fl a Ar rounds
|
||||||
When saving a private key, this option specifies the number of KDF
|
When saving a private key, this option specifies the number of KDF
|
||||||
(key derivation function) rounds used.
|
(key derivation function) rounds used.
|
||||||
|
@ -783,7 +779,7 @@ option.
|
||||||
Valid generator values are 2, 3, and 5.
|
Valid generator values are 2, 3, and 5.
|
||||||
.Pp
|
.Pp
|
||||||
Screened DH groups may be installed in
|
Screened DH groups may be installed in
|
||||||
.Pa /etc/moduli .
|
.Pa /etc/ssh/moduli .
|
||||||
It is important that this file contains moduli of a range of bit lengths and
|
It is important that this file contains moduli of a range of bit lengths and
|
||||||
that both ends of a connection share common moduli.
|
that both ends of a connection share common moduli.
|
||||||
.Pp
|
.Pp
|
||||||
|
@ -1154,7 +1150,7 @@ on all machines
|
||||||
where the user wishes to log in using public key authentication.
|
where the user wishes to log in using public key authentication.
|
||||||
There is no need to keep the contents of this file secret.
|
There is no need to keep the contents of this file secret.
|
||||||
.Pp
|
.Pp
|
||||||
.It Pa /etc/moduli
|
.It Pa /etc/ssh/moduli
|
||||||
Contains Diffie-Hellman groups used for DH-GEX.
|
Contains Diffie-Hellman groups used for DH-GEX.
|
||||||
The file format is described in
|
The file format is described in
|
||||||
.Xr moduli 5 .
|
.Xr moduli 5 .
|
||||||
|
|
4
ssh.1
4
ssh.1
|
@ -887,6 +887,10 @@ implements public key authentication protocol automatically,
|
||||||
using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
|
using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
|
||||||
The HISTORY section of
|
The HISTORY section of
|
||||||
.Xr ssl 8
|
.Xr ssl 8
|
||||||
|
(on non-OpenBSD systems, see
|
||||||
|
.nh
|
||||||
|
http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
|
||||||
|
.hy
|
||||||
contains a brief discussion of the DSA and RSA algorithms.
|
contains a brief discussion of the DSA and RSA algorithms.
|
||||||
.Pp
|
.Pp
|
||||||
The file
|
The file
|
||||||
|
|
5
sshd.8
5
sshd.8
|
@ -65,7 +65,7 @@ over an insecure network.
|
||||||
.Nm
|
.Nm
|
||||||
listens for connections from clients.
|
listens for connections from clients.
|
||||||
It is normally started at boot from
|
It is normally started at boot from
|
||||||
.Pa /etc/rc .
|
.Pa /etc/init.d/ssh .
|
||||||
It forks a new
|
It forks a new
|
||||||
daemon for each incoming connection.
|
daemon for each incoming connection.
|
||||||
The forked daemons handle
|
The forked daemons handle
|
||||||
|
@ -904,7 +904,7 @@ This file is for host-based authentication (see
|
||||||
.Xr ssh 1 ) .
|
.Xr ssh 1 ) .
|
||||||
It should only be writable by root.
|
It should only be writable by root.
|
||||||
.Pp
|
.Pp
|
||||||
.It Pa /etc/moduli
|
.It Pa /etc/ssh/moduli
|
||||||
Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
|
Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
|
||||||
key exchange method.
|
key exchange method.
|
||||||
The file format is described in
|
The file format is described in
|
||||||
|
@ -1002,7 +1002,6 @@ The content of this file is not sensitive; it can be world-readable.
|
||||||
.Xr ssh-keyscan 1 ,
|
.Xr ssh-keyscan 1 ,
|
||||||
.Xr chroot 2 ,
|
.Xr chroot 2 ,
|
||||||
.Xr hosts_access 5 ,
|
.Xr hosts_access 5 ,
|
||||||
.Xr login.conf 5 ,
|
|
||||||
.Xr moduli 5 ,
|
.Xr moduli 5 ,
|
||||||
.Xr sshd_config 5 ,
|
.Xr sshd_config 5 ,
|
||||||
.Xr inetd 8 ,
|
.Xr inetd 8 ,
|
||||||
|
|
|
@ -387,8 +387,7 @@ Certificates signed using other algorithms will not be accepted for
|
||||||
public key or host-based authentication.
|
public key or host-based authentication.
|
||||||
.It Cm ChallengeResponseAuthentication
|
.It Cm ChallengeResponseAuthentication
|
||||||
Specifies whether challenge-response authentication is allowed (e.g. via
|
Specifies whether challenge-response authentication is allowed (e.g. via
|
||||||
PAM or through authentication styles supported in
|
PAM).
|
||||||
.Xr login.conf 5 )
|
|
||||||
The default is
|
The default is
|
||||||
.Cm yes .
|
.Cm yes .
|
||||||
.It Cm ChrootDirectory
|
.It Cm ChrootDirectory
|
||||||
|
|
Loading…
Reference in New Issue