diff options
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 24bed5f61..01711dfff 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.130 2016/02/17 07:38:19 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.133 2016/06/16 06:10:45 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: February 17 2016 $ | 38 | .Dd $Mdocdate: June 16 2016 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -205,7 +205,7 @@ There is no way to recover a lost passphrase. | |||
205 | If the passphrase is lost or forgotten, a new key must be generated | 205 | If the passphrase is lost or forgotten, a new key must be generated |
206 | and the corresponding public key copied to other machines. | 206 | and the corresponding public key copied to other machines. |
207 | .Pp | 207 | .Pp |
208 | For RSA1 keys, | 208 | For RSA1 keys and keys stored in the newer OpenSSH format, |
209 | there is also a comment field in the key file that is only for | 209 | there is also a comment field in the key file that is only for |
210 | convenience to the user to help identify the key. | 210 | convenience to the user to help identify the key. |
211 | The comment can tell what the key is for, or whatever is useful. | 211 | The comment can tell what the key is for, or whatever is useful. |
@@ -260,7 +260,8 @@ flag will be ignored. | |||
260 | Provides a new comment. | 260 | Provides a new comment. |
261 | .It Fl c | 261 | .It Fl c |
262 | Requests changing the comment in the private and public key files. | 262 | Requests changing the comment in the private and public key files. |
263 | This operation is only supported for RSA1 keys. | 263 | This operation is only supported for RSA1 keys and keys stored in the |
264 | newer OpenSSH format. | ||
264 | The program will prompt for the file containing the private keys, for | 265 | The program will prompt for the file containing the private keys, for |
265 | the passphrase if the key has one, and for the new comment. | 266 | the passphrase if the key has one, and for the new comment. |
266 | .It Fl D Ar pkcs11 | 267 | .It Fl D Ar pkcs11 |
@@ -385,7 +386,8 @@ For RSA and DSA keys | |||
385 | tries to find the matching public key file and prints its fingerprint. | 386 | tries to find the matching public key file and prints its fingerprint. |
386 | If combined with | 387 | If combined with |
387 | .Fl v , | 388 | .Fl v , |
388 | an ASCII art representation of the key is supplied with the fingerprint. | 389 | a visual ASCII art representation of the key is supplied with the |
390 | fingerprint. | ||
389 | .It Fl M Ar memory | 391 | .It Fl M Ar memory |
390 | Specify the amount of memory to use (in megabytes) when generating | 392 | Specify the amount of memory to use (in megabytes) when generating |
391 | candidate moduli for DH-GEX. | 393 | candidate moduli for DH-GEX. |