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>2016-03-21 12:06:16 +0000
commit9d764f08fd01fa5c62a7cbff66165bc5d5ffb637 (patch)
tree407e1ee6641ebac2084838ae72790eadcf4a0634 /ssh-keygen.1
parent37a9102e7075f34d57b02d1eac631efa73f120fd (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 37a4fc2b2..24bed5f61 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -178,9 +178,7 @@ key in
178.Pa ~/.ssh/id_ed25519 178.Pa ~/.ssh/id_ed25519
179or 179or
180.Pa ~/.ssh/id_rsa . 180.Pa ~/.ssh/id_rsa .
181Additionally, the system administrator may use this to generate host keys, 181Additionally, the system administrator may use this to generate host keys.
182as seen in
183.Pa /etc/rc .
184.Pp 182.Pp
185Normally this program generates the key and asks for a file in which 183Normally this program generates the key and asks for a file in which
186to store the private key. 184to store the private key.
@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
227for which host keys 225for which host keys
228do not exist, generate the host keys with the default key file path, 226do not exist, generate the host keys with the default key file path,
229an empty passphrase, default bits for the key type, and default comment. 227an empty passphrase, default bits for the key type, and default comment.
230This is used by 228This is used by system administration scripts to generate new host keys.
231.Pa /etc/rc
232to generate new host keys.
233.It Fl a Ar rounds 229.It Fl a Ar rounds
234When saving a new-format private key (i.e. an ed25519 key or any SSH protocol 230When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
2352 key when the 2312 key when the
@@ -642,7 +638,7 @@ option.
642Valid generator values are 2, 3, and 5. 638Valid generator values are 2, 3, and 5.
643.Pp 639.Pp
644Screened DH groups may be installed in 640Screened DH groups may be installed in
645.Pa /etc/moduli . 641.Pa /etc/ssh/moduli .
646It is important that this file contains moduli of a range of bit lengths and 642It is important that this file contains moduli of a range of bit lengths and
647that both ends of a connection share common moduli. 643that both ends of a connection share common moduli.
648.Sh CERTIFICATES 644.Sh CERTIFICATES
@@ -841,7 +837,7 @@ on all machines
841where the user wishes to log in using public key authentication. 837where the user wishes to log in using public key authentication.
842There is no need to keep the contents of this file secret. 838There is no need to keep the contents of this file secret.
843.Pp 839.Pp
844.It Pa /etc/moduli 840.It Pa /etc/ssh/moduli
845Contains Diffie-Hellman groups used for DH-GEX. 841Contains Diffie-Hellman groups used for DH-GEX.
846The file format is described in 842The file format is described in
847.Xr moduli 5 . 843.Xr moduli 5 .