summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-12 09:21:02 +1100
committerDamien Miller <djm@mindrot.org>2010-02-12 09:21:02 +1100
commit7ea845e48df6d34a333ebbe79380cba0938d02a5 (patch)
tree44ab0d3fdfe0560b7ca92f5747e9dd5d012aea18 /ssh-add.1
parent17751bcab25681d341442fdc2386a30a6bea345e (diff)
- markus@cvs.openbsd.org 2010/02/08 10:50:20
[pathnames.h readconf.c readconf.h scp.1 sftp.1 ssh-add.1 ssh-add.c] [ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config.5] replace our obsolete smartcard code with PKCS#11. ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11 provider (shared library) while ssh-agent(1) delegates PKCS#11 to a forked a ssh-pkcs11-helper process. PKCS#11 is currently a compile time option. feedback and ok djm@; inspired by patches from Alon Bar-Lev `
Diffstat (limited to 'ssh-add.1')
-rw-r--r--ssh-add.116
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index ee9a00ff0..a5dc3311a 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.48 2009/10/22 15:02:12 sobrado Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.49 2010/02/08 10:50:20 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: October 22 2009 $ 40.Dd $Mdocdate: February 8 2010 $
41.Dt SSH-ADD 1 41.Dt SSH-ADD 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -101,17 +101,17 @@ If no public key is found at a given path,
101will append 101will append
102.Pa .pub 102.Pa .pub
103and retry. 103and retry.
104.It Fl e Ar reader 104.It Fl e Ar pkcs11
105Remove key in smartcard 105Remove key provided by
106.Ar reader . 106.Ar pkcs11 .
107.It Fl L 107.It Fl L
108Lists public key parameters of all identities currently represented 108Lists public key parameters of all identities currently represented
109by the agent. 109by the agent.
110.It Fl l 110.It Fl l
111Lists fingerprints of all identities currently represented by the agent. 111Lists fingerprints of all identities currently represented by the agent.
112.It Fl s Ar reader 112.It Fl s Ar pkcs11
113Add key in smartcard 113Add key provider by
114.Ar reader . 114.Ar pkcs11 .
115.It Fl t Ar life 115.It Fl t Ar life
116Set a maximum lifetime when adding identities to an agent. 116Set a maximum lifetime when adding identities to an agent.
117The lifetime may be specified in seconds or in a time format 117The lifetime may be specified in seconds or in a time format