diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:18:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 10:05:01 +1000 |
commit | 873d3e7d9a4707d0934fb4c4299354418f91b541 (patch) | |
tree | 4fd961131c84ad1626f11ffdcdc4316a26febacb /ssh-keygen.1 | |
parent | 788ac799a6efa40517f2ac0d895a610394298ffc (diff) |
upstream commit
remove KEY_RSA1
ok markus@
Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index a83388a9f..be1a169f4 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.135 2017/04/29 06:06:01 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.136 2017/04/30 23:18:44 djm 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: April 29 2017 $ | 38 | .Dd $Mdocdate: April 30 2017 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -207,7 +207,7 @@ There is no way to recover a lost passphrase. | |||
207 | If the passphrase is lost or forgotten, a new key must be generated | 207 | If the passphrase is lost or forgotten, a new key must be generated |
208 | and the corresponding public key copied to other machines. | 208 | and the corresponding public key copied to other machines. |
209 | .Pp | 209 | .Pp |
210 | For RSA1 keys and keys stored in the newer OpenSSH format, | 210 | For keys stored in the newer OpenSSH format, |
211 | there is also a comment field in the key file that is only for | 211 | there is also a comment field in the key file that is only for |
212 | convenience to the user to help identify the key. | 212 | convenience to the user to help identify the key. |
213 | The comment can tell what the key is for, or whatever is useful. | 213 | The comment can tell what the key is for, or whatever is useful. |
@@ -264,7 +264,7 @@ flag will be ignored. | |||
264 | Provides a new comment. | 264 | Provides a new comment. |
265 | .It Fl c | 265 | .It Fl c |
266 | Requests changing the comment in the private and public key files. | 266 | Requests changing the comment in the private and public key files. |
267 | This operation is only supported for RSA1 keys and keys stored in the | 267 | This operation is only supported for keys stored in the |
268 | newer OpenSSH format. | 268 | newer OpenSSH format. |
269 | The program will prompt for the file containing the private keys, for | 269 | The program will prompt for the file containing the private keys, for |
270 | the passphrase if the key has one, and for the new comment. | 270 | the passphrase if the key has one, and for the new comment. |
@@ -384,7 +384,6 @@ section. | |||
384 | Prints the contents of one or more certificates. | 384 | Prints the contents of one or more certificates. |
385 | .It Fl l | 385 | .It Fl l |
386 | Show fingerprint of specified public key file. | 386 | Show fingerprint of specified public key file. |
387 | Private RSA1 keys are also supported. | ||
388 | For RSA and DSA keys | 387 | For RSA and DSA keys |
389 | .Nm | 388 | .Nm |
390 | tries to find the matching public key file and prints its fingerprint. | 389 | tries to find the matching public key file and prints its fingerprint. |