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>2015-09-08 14:50:02 +0100
commit5399167019a01a47c5208b0f8a6f0600b9af3bd5 (patch)
tree4a8e35153bbc1953ea9e6d15ca462bbdf6b5f6c6 /ssh-keygen.1
parent5919db7dc21a34c31be70170728c2838ff59b740 (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: 2014-10-07 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 9b93666c9..19bed1e34 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -174,9 +174,7 @@ key in
174.Pa ~/.ssh/id_ed25519 174.Pa ~/.ssh/id_ed25519
175or 175or
176.Pa ~/.ssh/id_rsa . 176.Pa ~/.ssh/id_rsa .
177Additionally, the system administrator may use this to generate host keys, 177Additionally, the system administrator may use this to generate host keys.
178as seen in
179.Pa /etc/rc .
180.Pp 178.Pp
181Normally this program generates the key and asks for a file in which 179Normally this program generates the key and asks for a file in which
182to store the private key. 180to store the private key.
@@ -223,9 +221,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
223for which host keys 221for which host keys
224do not exist, generate the host keys with the default key file path, 222do not exist, generate the host keys with the default key file path,
225an empty passphrase, default bits for the key type, and default comment. 223an empty passphrase, default bits for the key type, and default comment.
226This is used by 224This is used by system administration scripts to generate new host keys.
227.Pa /etc/rc
228to generate new host keys.
229.It Fl a Ar rounds 225.It Fl a Ar rounds
230When saving a new-format private key (i.e. an ed25519 key or any SSH protocol 226When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
2312 key when the 2272 key when the
@@ -638,7 +634,7 @@ option.
638Valid generator values are 2, 3, and 5. 634Valid generator values are 2, 3, and 5.
639.Pp 635.Pp
640Screened DH groups may be installed in 636Screened DH groups may be installed in
641.Pa /etc/moduli . 637.Pa /etc/ssh/moduli .
642It is important that this file contains moduli of a range of bit lengths and 638It is important that this file contains moduli of a range of bit lengths and
643that both ends of a connection share common moduli. 639that both ends of a connection share common moduli.
644.Sh CERTIFICATES 640.Sh CERTIFICATES
@@ -837,7 +833,7 @@ on all machines
837where the user wishes to log in using public key authentication. 833where the user wishes to log in using public key authentication.
838There is no need to keep the contents of this file secret. 834There is no need to keep the contents of this file secret.
839.Pp 835.Pp
840.It Pa /etc/moduli 836.It Pa /etc/ssh/moduli
841Contains Diffie-Hellman groups used for DH-GEX. 837Contains Diffie-Hellman groups used for DH-GEX.
842The file format is described in 838The file format is described in
843.Xr moduli 5 . 839.Xr moduli 5 .