summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-09 16:10:09 +0000
committerColin Watson <cjwatson@debian.org>2014-03-20 00:32:29 +0000
commitec9bfd62211fdf5a3004ef2045c2eb3baccfd375 (patch)
tree3449d3845f20bfb88b95e5ee829672338a0b3695 /ssh-keygen.1
parenteb567100ef178f4395c95cc1f37b921e02c3dd5b (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: 2013-09-14 Patch-Name: openbsd-docs.patch
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.112
1 files changed, 4 insertions, 8 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 12e00d416..a71de7481 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -172,9 +172,7 @@ key in
172.Pa ~/.ssh/id_ed25519 172.Pa ~/.ssh/id_ed25519
173or 173or
174.Pa ~/.ssh/id_rsa . 174.Pa ~/.ssh/id_rsa .
175Additionally, the system administrator may use this to generate host keys, 175Additionally, the system administrator may use this to generate host keys.
176as seen in
177.Pa /etc/rc .
178.Pp 176.Pp
179Normally this program generates the key and asks for a file in which 177Normally this program generates the key and asks for a file in which
180to store the private key. 178to store the private key.
@@ -221,9 +219,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
221for which host keys 219for which host keys
222do not exist, generate the host keys with the default key file path, 220do not exist, generate the host keys with the default key file path,
223an empty passphrase, default bits for the key type, and default comment. 221an empty passphrase, default bits for the key type, and default comment.
224This is used by 222This is used by system administration scripts to generate new host keys.
225.Pa /etc/rc
226to generate new host keys.
227.It Fl a Ar rounds 223.It Fl a Ar rounds
228When saving a new-format private key (i.e. an ed25519 key or any SSH protocol 224When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
2292 key when the 2252 key when the
@@ -628,7 +624,7 @@ option.
628Valid generator values are 2, 3, and 5. 624Valid generator values are 2, 3, and 5.
629.Pp 625.Pp
630Screened DH groups may be installed in 626Screened DH groups may be installed in
631.Pa /etc/moduli . 627.Pa /etc/ssh/moduli .
632It is important that this file contains moduli of a range of bit lengths and 628It is important that this file contains moduli of a range of bit lengths and
633that both ends of a connection share common moduli. 629that both ends of a connection share common moduli.
634.Sh CERTIFICATES 630.Sh CERTIFICATES
@@ -827,7 +823,7 @@ on all machines
827where the user wishes to log in using public key authentication. 823where the user wishes to log in using public key authentication.
828There is no need to keep the contents of this file secret. 824There is no need to keep the contents of this file secret.
829.Pp 825.Pp
830.It Pa /etc/moduli 826.It Pa /etc/ssh/moduli
831Contains Diffie-Hellman groups used for DH-GEX. 827Contains Diffie-Hellman groups used for DH-GEX.
832The file format is described in 828The file format is described in
833.Xr moduli 5 . 829.Xr moduli 5 .