summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-12 09:26:02 +1100
committerDamien Miller <djm@mindrot.org>2010-02-12 09:26:02 +1100
commita76184445530cb13ded5827546756471d7d423e2 (patch)
treeab15565a7058b0fb21635acb9be621825cd0ad5f /ssh-keygen.1
parent47cf16b8df67ce02866eefbe855174fa7dfbd359 (diff)
- markus@cvs.openbsd.org 2010/02/10 23:20:38
[ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5] pkcs#11 is no longer optional; improve wording; ok jmc@
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.19
1 files changed, 4 insertions, 5 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index c0c323640..f09e1a100 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.82 2010/02/08 22:03:05 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.83 2010/02/10 23:20:38 markus Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: February 8 2010 $ 40.Dd $Mdocdate: February 10 2010 $
41.Dt SSH-KEYGEN 1 41.Dt SSH-KEYGEN 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -199,9 +199,8 @@ This operation is only supported for RSA1 keys.
199The program will prompt for the file containing the private keys, for 199The program will prompt for the file containing the private keys, for
200the passphrase if the key has one, and for the new comment. 200the passphrase if the key has one, and for the new comment.
201.It Fl D Ar pkcs11 201.It Fl D Ar pkcs11
202Download the RSA public keys stored in the 202Download the RSA public keys provided by the PKCS#11 shared library
203.Ar pkcs11 203.Ar pkcs11 .
204provider.
205.It Fl e 204.It Fl e
206This option will read a private or public OpenSSH key file and 205This option will read a private or public OpenSSH key file and
207print the key in 206print the key in