diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /ssh-keygen.1 | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 3987b1e66..5454d00ce 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.66 2005/03/01 18:15:56 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.69 2005/06/08 03:50:00 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -129,10 +129,10 @@ section for details. | |||
129 | Normally each user wishing to use SSH | 129 | Normally each user wishing to use SSH |
130 | with RSA or DSA authentication runs this once to create the authentication | 130 | with RSA or DSA authentication runs this once to create the authentication |
131 | key in | 131 | key in |
132 | .Pa $HOME/.ssh/identity , | 132 | .Pa ~/.ssh/identity , |
133 | .Pa $HOME/.ssh/id_dsa | 133 | .Pa ~/.ssh/id_dsa |
134 | or | 134 | or |
135 | .Pa $HOME/.ssh/id_rsa . | 135 | .Pa ~/.ssh/id_rsa . |
136 | Additionally, the system administrator may use this to generate host keys, | 136 | Additionally, the system administrator may use this to generate host keys, |
137 | as seen in | 137 | as seen in |
138 | .Pa /etc/rc . | 138 | .Pa /etc/rc . |
@@ -188,8 +188,8 @@ Show the bubblebabble digest of specified private or public key file. | |||
188 | .It Fl b Ar bits | 188 | .It Fl b Ar bits |
189 | Specifies the number of bits in the key to create. | 189 | Specifies the number of bits in the key to create. |
190 | Minimum is 512 bits. | 190 | Minimum is 512 bits. |
191 | Generally, 1024 bits is considered sufficient. | 191 | Generally, 2048 bits is considered sufficient. |
192 | The default is 1024 bits. | 192 | The default is 2048 bits. |
193 | .It Fl C Ar comment | 193 | .It Fl C Ar comment |
194 | Provides a new comment. | 194 | Provides a new comment. |
195 | .It Fl c | 195 | .It Fl c |
@@ -232,8 +232,10 @@ command. | |||
232 | .It Fl H | 232 | .It Fl H |
233 | Hash a | 233 | Hash a |
234 | .Pa known_hosts | 234 | .Pa known_hosts |
235 | file, printing the result to standard output. | 235 | file. |
236 | This replaces all hostnames and addresses with hashed representations. | 236 | This replaces all hostnames and addresses with hashed representations |
237 | within the specified file; the original content is moved to a file with | ||
238 | a .old suffix. | ||
237 | These hashes may be used normally by | 239 | These hashes may be used normally by |
238 | .Nm ssh | 240 | .Nm ssh |
239 | and | 241 | and |
@@ -379,7 +381,7 @@ It is important that this file contains moduli of a range of bit lengths and | |||
379 | that both ends of a connection share common moduli. | 381 | that both ends of a connection share common moduli. |
380 | .Sh FILES | 382 | .Sh FILES |
381 | .Bl -tag -width Ds | 383 | .Bl -tag -width Ds |
382 | .It Pa $HOME/.ssh/identity | 384 | .It Pa ~/.ssh/identity |
383 | Contains the protocol version 1 RSA authentication identity of the user. | 385 | Contains the protocol version 1 RSA authentication identity of the user. |
384 | This file should not be readable by anyone but the user. | 386 | This file should not be readable by anyone but the user. |
385 | It is possible to | 387 | It is possible to |
@@ -390,14 +392,14 @@ This file is not automatically accessed by | |||
390 | but it is offered as the default file for the private key. | 392 | but it is offered as the default file for the private key. |
391 | .Xr ssh 1 | 393 | .Xr ssh 1 |
392 | will read this file when a login attempt is made. | 394 | will read this file when a login attempt is made. |
393 | .It Pa $HOME/.ssh/identity.pub | 395 | .It Pa ~/.ssh/identity.pub |
394 | Contains the protocol version 1 RSA public key for authentication. | 396 | Contains the protocol version 1 RSA public key for authentication. |
395 | The contents of this file should be added to | 397 | The contents of this file should be added to |
396 | .Pa $HOME/.ssh/authorized_keys | 398 | .Pa ~/.ssh/authorized_keys |
397 | on all machines | 399 | on all machines |
398 | where the user wishes to log in using RSA authentication. | 400 | where the user wishes to log in using RSA authentication. |
399 | There is no need to keep the contents of this file secret. | 401 | There is no need to keep the contents of this file secret. |
400 | .It Pa $HOME/.ssh/id_dsa | 402 | .It Pa ~/.ssh/id_dsa |
401 | Contains the protocol version 2 DSA authentication identity of the user. | 403 | Contains the protocol version 2 DSA authentication identity of the user. |
402 | This file should not be readable by anyone but the user. | 404 | This file should not be readable by anyone but the user. |
403 | It is possible to | 405 | It is possible to |
@@ -408,14 +410,14 @@ This file is not automatically accessed by | |||
408 | but it is offered as the default file for the private key. | 410 | but it is offered as the default file for the private key. |
409 | .Xr ssh 1 | 411 | .Xr ssh 1 |
410 | will read this file when a login attempt is made. | 412 | will read this file when a login attempt is made. |
411 | .It Pa $HOME/.ssh/id_dsa.pub | 413 | .It Pa ~/.ssh/id_dsa.pub |
412 | Contains the protocol version 2 DSA public key for authentication. | 414 | Contains the protocol version 2 DSA public key for authentication. |
413 | The contents of this file should be added to | 415 | The contents of this file should be added to |
414 | .Pa $HOME/.ssh/authorized_keys | 416 | .Pa ~/.ssh/authorized_keys |
415 | on all machines | 417 | on all machines |
416 | where the user wishes to log in using public key authentication. | 418 | where the user wishes to log in using public key authentication. |
417 | There is no need to keep the contents of this file secret. | 419 | There is no need to keep the contents of this file secret. |
418 | .It Pa $HOME/.ssh/id_rsa | 420 | .It Pa ~/.ssh/id_rsa |
419 | Contains the protocol version 2 RSA authentication identity of the user. | 421 | Contains the protocol version 2 RSA authentication identity of the user. |
420 | This file should not be readable by anyone but the user. | 422 | This file should not be readable by anyone but the user. |
421 | It is possible to | 423 | It is possible to |
@@ -426,10 +428,10 @@ This file is not automatically accessed by | |||
426 | but it is offered as the default file for the private key. | 428 | but it is offered as the default file for the private key. |
427 | .Xr ssh 1 | 429 | .Xr ssh 1 |
428 | will read this file when a login attempt is made. | 430 | will read this file when a login attempt is made. |
429 | .It Pa $HOME/.ssh/id_rsa.pub | 431 | .It Pa ~/.ssh/id_rsa.pub |
430 | Contains the protocol version 2 RSA public key for authentication. | 432 | Contains the protocol version 2 RSA public key for authentication. |
431 | The contents of this file should be added to | 433 | The contents of this file should be added to |
432 | .Pa $HOME/.ssh/authorized_keys | 434 | .Pa ~/.ssh/authorized_keys |
433 | on all machines | 435 | on all machines |
434 | where the user wishes to log in using public key authentication. | 436 | where the user wishes to log in using public key authentication. |
435 | There is no need to keep the contents of this file secret. | 437 | There is no need to keep the contents of this file secret. |