1 files changed, 20 insertions, 12 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 005041b68..d7cc53101 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-add.1,v 1.46 2007/06/12 13:41:03 jmc Exp $
+.\"     $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -37,7 +37,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2007 $
+.Dd $Mdocdate: March 5 2010 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -49,9 +49,9 @@
 .Op Fl t Ar life
 .Op Ar
 .Nm ssh-add
-.Fl s Ar reader
+.Fl s Ar pkcs11
 .Nm ssh-add
-.Fl e Ar reader
+.Fl e Ar pkcs11
 .Sh DESCRIPTION
 .Nm
 adds RSA or DSA identities to the authentication agent,
@@ -61,7 +61,14 @@ When run without arguments, it adds the files
 .Pa ~/.ssh/id_dsa
 and
 .Pa ~/.ssh/identity .
+After loading a private key,
+.Nm
+will try to load corresponding certificate information from the
+filename obtained by appending
+.Pa -cert.pub
+to the name of the private key file.
 Alternative file names can be given on the command line.
+.Pp
 If any file requires a passphrase,
 .Nm
 asks for the passphrase from the user.
@@ -101,17 +108,17 @@ If no public key is found at a given path,
 will append
 .Pa .pub
 and retry.
-.It Fl e Ar reader
+.It Fl e Ar pkcs11
-Remove key in smartcard
+Remove keys provided by the PKCS#11 shared library
-.Ar reader .
+.Ar pkcs11 .
 .It Fl L
 Lists public key parameters of all identities currently represented
 by the agent.
 .It Fl l
 Lists fingerprints of all identities currently represented by the agent.
-.It Fl s Ar reader
+.It Fl s Ar pkcs11
-Add key in smartcard
+Add keys provided by the PKCS#11 shared library
-.Ar reader .
+.Ar pkcs11 .
 .It Fl t Ar life
 Set a maximum lifetime when adding identities to an agent.
 The lifetime may be specified in seconds or in a time format
@@ -148,8 +155,9 @@ may be necessary to redirect the input from
 .Pa /dev/null
 to make this work.)
 .It Ev SSH_AUTH_SOCK
-Identifies the path of a unix-domain socket used to communicate with the
+Identifies the path of a
-agent.
+.Ux Ns -domain
+socket used to communicate with the agent.
 .El
 .Sh FILES
 .Bl -tag -width Ds

diff --git a/ssh-add.1 b/ssh-add.1 index 005041b68..d7cc53101 100644 --- a/ssh-add.1 +++ b/ssh-add.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: ssh-add.1,v 1.46 2007/06/12 13:41:03 jmc Exp $	1	.\" $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm 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: June 12 2007 $	40	.Dd $Mdocdate: March 5 2010 $
41	.Dt SSH-ADD 1	41	.Dt SSH-ADD 1
42	.Os	42	.Os
43	.Sh NAME	43	.Sh NAME
@@ -49,9 +49,9 @@
49	.Op Fl t Ar life	49	.Op Fl t Ar life
50	.Op Ar	50	.Op Ar
51	.Nm ssh-add	51	.Nm ssh-add
52	.Fl s Ar reader	52	.Fl s Ar pkcs11
53	.Nm ssh-add	53	.Nm ssh-add
54	.Fl e Ar reader	54	.Fl e Ar pkcs11
55	.Sh DESCRIPTION	55	.Sh DESCRIPTION
56	.Nm	56	.Nm
57	adds RSA or DSA identities to the authentication agent,	57	adds RSA or DSA identities to the authentication agent,
@@ -61,7 +61,14 @@ When run without arguments, it adds the files
61	.Pa ~/.ssh/id_dsa	61	.Pa ~/.ssh/id_dsa
62	and	62	and
63	.Pa ~/.ssh/identity .	63	.Pa ~/.ssh/identity .
		64	After loading a private key,
		65	.Nm
		66	will try to load corresponding certificate information from the
		67	filename obtained by appending
		68	.Pa -cert.pub
		69	to the name of the private key file.
64	Alternative file names can be given on the command line.	70	Alternative file names can be given on the command line.
		71	.Pp
65	If any file requires a passphrase,	72	If any file requires a passphrase,
66	.Nm	73	.Nm
67	asks for the passphrase from the user.	74	asks for the passphrase from the user.
@@ -101,17 +108,17 @@ If no public key is found at a given path,
101	will append	108	will append
102	.Pa .pub	109	.Pa .pub
103	and retry.	110	and retry.
104	.It Fl e Ar reader	111	.It Fl e Ar pkcs11
105	Remove key in smartcard	112	Remove keys provided by the PKCS#11 shared library
106	.Ar reader .	113	.Ar pkcs11 .
107	.It Fl L	114	.It Fl L
108	Lists public key parameters of all identities currently represented	115	Lists public key parameters of all identities currently represented
109	by the agent.	116	by the agent.
110	.It Fl l	117	.It Fl l
111	Lists fingerprints of all identities currently represented by the agent.	118	Lists fingerprints of all identities currently represented by the agent.
112	.It Fl s Ar reader	119	.It Fl s Ar pkcs11
113	Add key in smartcard	120	Add keys provided by the PKCS#11 shared library
114	.Ar reader .	121	.Ar pkcs11 .
115	.It Fl t Ar life	122	.It Fl t Ar life
116	Set a maximum lifetime when adding identities to an agent.	123	Set a maximum lifetime when adding identities to an agent.
117	The lifetime may be specified in seconds or in a time format	124	The lifetime may be specified in seconds or in a time format
@@ -148,8 +155,9 @@ may be necessary to redirect the input from
148	.Pa /dev/null	155	.Pa /dev/null
149	to make this work.)	156	to make this work.)
150	.It Ev SSH_AUTH_SOCK	157	.It Ev SSH_AUTH_SOCK
151	Identifies the path of a unix-domain socket used to communicate with the	158	Identifies the path of a
152	agent.	159	.Ux Ns -domain
		160	socket used to communicate with the agent.
153	.El	161	.El
154	.Sh FILES	162	.Sh FILES
155	.Bl -tag -width Ds	163	.Bl -tag -width Ds