summaryrefslogtreecommitdiff
path: root/ssh-keygen.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-24 12:49:36 +0100
committerColin Watson <cjwatson@debian.org>2018-08-24 12:49:36 +0100
commite6547182a54f0f268ee36e7c99319eeddffbaff2 (patch)
tree417527229ad3f3764ba71ea383f478a168895087 /ssh-keygen.0
parented6ae9c1a014a08ff5db3d768f01f2e427eeb476 (diff)
parent71508e06fab14bc415a79a08f5535ad7bffa93d9 (diff)
Import openssh_7.8p1.orig.tar.gz
Diffstat (limited to 'ssh-keygen.0')
-rw-r--r--ssh-keygen.024
1 files changed, 9 insertions, 15 deletions
diff --git a/ssh-keygen.0 b/ssh-keygen.0
index 417e8382b..f8cc3c3e2 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -88,9 +88,8 @@ DESCRIPTION
88 new host keys. 88 new host keys.
89 89
90 -a rounds 90 -a rounds
91 When saving a new-format private key (i.e. an ed25519 key or when 91 When saving a private key this option specifies the number of KDF
92 the -o flag is set), this option specifies the number of KDF (key 92 (key derivation function) rounds used. Higher numbers result in
93 derivation function) rounds used. Higher numbers result in
94 slower passphrase verification and increased resistance to brute- 93 slower passphrase verification and increased resistance to brute-
95 force password cracking (should the keys be stolen). 94 force password cracking (should the keys be stolen).
96 95
@@ -115,10 +114,9 @@ DESCRIPTION
115 Provides a new comment. 114 Provides a new comment.
116 115
117 -c Requests changing the comment in the private and public key 116 -c Requests changing the comment in the private and public key
118 files. This operation is only supported for keys stored in the 117 files. The program will prompt for the file containing the
119 newer OpenSSH format. The program will prompt for the file 118 private keys, for the passphrase if the key has one, and for the
120 containing the private keys, for the passphrase if the key has 119 new comment.
121 one, and for the new comment.
122 120
123 -D pkcs11 121 -D pkcs11
124 Download the RSA public keys provided by the PKCS#11 shared 122 Download the RSA public keys provided by the PKCS#11 shared
@@ -212,7 +210,9 @@ DESCRIPTION
212 conversion options. The supported key formats are: M-bM-^@M-^\RFC4716M-bM-^@M-^] 210 conversion options. The supported key formats are: M-bM-^@M-^\RFC4716M-bM-^@M-^]
213 (RFC 4716/SSH2 public or private key), M-bM-^@M-^\PKCS8M-bM-^@M-^] (PEM PKCS8 public 211 (RFC 4716/SSH2 public or private key), M-bM-^@M-^\PKCS8M-bM-^@M-^] (PEM PKCS8 public
214 key) or M-bM-^@M-^\PEMM-bM-^@M-^] (PEM public key). The default conversion format is 212 key) or M-bM-^@M-^\PEMM-bM-^@M-^] (PEM public key). The default conversion format is
215 M-bM-^@M-^\RFC4716M-bM-^@M-^]. 213 M-bM-^@M-^\RFC4716M-bM-^@M-^]. Setting a format of M-bM-^@M-^\PEMM-bM-^@M-^] when generating or updating
214 a supported private key type will cause the key to be stored in
215 the legacy PEM private key format.
216 216
217 -N new_passphrase 217 -N new_passphrase
218 Provides the new passphrase. 218 Provides the new passphrase.
@@ -289,12 +289,6 @@ DESCRIPTION
289 separated list of one or more address/netmask pairs in 289 separated list of one or more address/netmask pairs in
290 CIDR format. 290 CIDR format.
291 291
292 -o Causes ssh-keygen to save private keys using the new OpenSSH
293 format rather than the more compatible PEM format. The new
294 format has increased resistance to brute-force password cracking
295 but is not supported by versions of OpenSSH prior to 6.5.
296 Ed25519 keys always use the new private key format.
297
298 -P passphrase 292 -P passphrase
299 Provides the (old) passphrase. 293 Provides the (old) passphrase.
300 294
@@ -577,4 +571,4 @@ AUTHORS
577 created OpenSSH. Markus Friedl contributed the support for SSH protocol 571 created OpenSSH. Markus Friedl contributed the support for SSH protocol
578 versions 1.5 and 2.0. 572 versions 1.5 and 2.0.
579 573
580OpenBSD 6.2 March 12, 2018 OpenBSD 6.2 574OpenBSD 6.4 August 8, 2018 OpenBSD 6.4