diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:51:34 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:51:34 +0000 |
commit | a1ec4a9cb8b2f291780f7a66be967e8e22fc4bde (patch) | |
tree | 9705c32306ea3a0360963fb5c9ca9ff73b1097e4 | |
parent | 97be31e6ff07b4d396e95b0799dca754f013e1a8 (diff) |
- jakob@cvs.openbsd.org 2001/08/02 15:07:23
[ssh-keygen.1]
document smartcard upload/download. ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.1 | 15 |
2 files changed, 17 insertions, 3 deletions
@@ -113,6 +113,9 @@ | |||
113 | - jakob@cvs.openbsd.org 2001/08/02 15:06:52 | 113 | - jakob@cvs.openbsd.org 2001/08/02 15:06:52 |
114 | [ssh-keygen.c] | 114 | [ssh-keygen.c] |
115 | more verbose usage(). ok markus@ | 115 | more verbose usage(). ok markus@ |
116 | - jakob@cvs.openbsd.org 2001/08/02 15:07:23 | ||
117 | [ssh-keygen.1] | ||
118 | document smartcard upload/download. ok markus@ | ||
116 | 119 | ||
117 | 20010803 | 120 | 20010803 |
118 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 121 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6223,4 +6226,4 @@ | |||
6223 | - Wrote replacements for strlcpy and mkdtemp | 6226 | - Wrote replacements for strlcpy and mkdtemp |
6224 | - Released 1.0pre1 | 6227 | - Released 1.0pre1 |
6225 | 6228 | ||
6226 | $Id: ChangeLog,v 1.1455 2001/08/06 21:49:06 mouring Exp $ | 6229 | $Id: ChangeLog,v 1.1456 2001/08/06 21:51:34 mouring Exp $ |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 290319d44..e2d41141a 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.47 2001/07/23 14:14:18 aaron Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.48 2001/08/02 15:07:23 jakob Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -76,6 +76,11 @@ | |||
76 | .Nm ssh-keygen | 76 | .Nm ssh-keygen |
77 | .Fl B | 77 | .Fl B |
78 | .Op Fl f Ar input_keyfile | 78 | .Op Fl f Ar input_keyfile |
79 | .Nm ssh-keygen | ||
80 | .Fl D Ar reader | ||
81 | .Nm ssh-keygen | ||
82 | .Fl U Ar reader | ||
83 | .Op Fl f Ar input_keyfile | ||
79 | .Sh DESCRIPTION | 84 | .Sh DESCRIPTION |
80 | .Nm | 85 | .Nm |
81 | generates, manages and converts authentication keys for | 86 | generates, manages and converts authentication keys for |
@@ -151,7 +156,7 @@ print the key in a | |||
151 | to stdout. | 156 | to stdout. |
152 | This option allows exporting keys for use by several commercial | 157 | This option allows exporting keys for use by several commercial |
153 | SSH implementations. | 158 | SSH implementations. |
154 | .It Fl f | 159 | .It Fl f Ar filename |
155 | Specifies the filename of the key file. | 160 | Specifies the filename of the key file. |
156 | .It Fl i | 161 | .It Fl i |
157 | This option will read an unencrypted private (or public) key file | 162 | This option will read an unencrypted private (or public) key file |
@@ -194,10 +199,16 @@ The default is | |||
194 | Show the bubblebabble digest of specified private or public key file. | 199 | Show the bubblebabble digest of specified private or public key file. |
195 | .It Fl C Ar comment | 200 | .It Fl C Ar comment |
196 | Provides the new comment. | 201 | Provides the new comment. |
202 | .It Fl D Ar reader | ||
203 | Download the RSA public key stored in the smartcard in | ||
204 | .Ar reader . | ||
197 | .It Fl N Ar new_passphrase | 205 | .It Fl N Ar new_passphrase |
198 | Provides the new passphrase. | 206 | Provides the new passphrase. |
199 | .It Fl P Ar passphrase | 207 | .It Fl P Ar passphrase |
200 | Provides the (old) passphrase. | 208 | Provides the (old) passphrase. |
209 | .It Fl U Ar reader | ||
210 | Upload an existing RSA private key into the smartcard in | ||
211 | .Ar reader . | ||
201 | .El | 212 | .El |
202 | .Sh FILES | 213 | .Sh FILES |
203 | .Bl -tag -width Ds | 214 | .Bl -tag -width Ds |