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-12-28 20:05:06 +0000
commit807a8417d6f3c3203024ed8c026a1f79ace12ecb (patch)
tree6cebc0a015a9c53fb6be2a41ff7a9bdf002b9ece /ssh-keygen.1
parent300ba52e4888c6ee488eb8d4cd8fcb9936c420be (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 ce2213c78..01711dfff 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
@@ -644,7 +640,7 @@ option.
644Valid generator values are 2, 3, and 5. 640Valid generator values are 2, 3, and 5.
645.Pp 641.Pp
646Screened DH groups may be installed in 642Screened DH groups may be installed in
647.Pa /etc/moduli . 643.Pa /etc/ssh/moduli .
648It is important that this file contains moduli of a range of bit lengths and 644It is important that this file contains moduli of a range of bit lengths and
649that both ends of a connection share common moduli. 645that both ends of a connection share common moduli.
650.Sh CERTIFICATES 646.Sh CERTIFICATES
@@ -843,7 +839,7 @@ on all machines
843where the user wishes to log in using public key authentication. 839where the user wishes to log in using public key authentication.
844There is no need to keep the contents of this file secret. 840There is no need to keep the contents of this file secret.
845.Pp 841.Pp
846.It Pa /etc/moduli 842.It Pa /etc/ssh/moduli
847Contains Diffie-Hellman groups used for DH-GEX. 843Contains Diffie-Hellman groups used for DH-GEX.
848The file format is described in 844The file format is described in
849.Xr moduli 5 . 845.Xr moduli 5 .