aboutsummaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2012-08-29 15:46:01 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2012-08-29 15:46:01 +0000
commit2e97a36905ba9936cb9972e37c5e56deb288e442 (patch)
tree63724b2d8e911727737ec31273789b3f46ffa6ff /ssh-add.1
parent4bc11fc94e472842a59429d633d4b97124da2a2e (diff)
downloadsrc-2e97a36905ba9936cb9972e37c5e56deb288e442.tar.gz
src-2e97a36905ba9936cb9972e37c5e56deb288e442.zip
Vendor import of OpenSSH 6.0p1.vendor/openssh/6.0p1
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=239844 svn path=/vendor-crypto/openssh/6.0p1/; revision=239847; tag=vendor/openssh/6.0p1
Diffstat (limited to 'ssh-add.1')
-rw-r--r--ssh-add.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index fd48ff98fa3f..aec620deaf33 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.55 2010/10/28 18:33:28 jmc Exp $
+.\" $OpenBSD: ssh-add.1,v 1.56 2011/10/18 05:00:48 djm Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,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: October 28 2010 $
+.Dd $Mdocdate: October 18 2011 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@@ -43,7 +43,7 @@
.Nd adds private key identities to the authentication agent
.Sh SYNOPSIS
.Nm ssh-add
-.Op Fl cDdLlXx
+.Op Fl cDdkLlXx
.Op Fl t Ar life
.Op Ar
.Nm ssh-add
@@ -110,6 +110,9 @@ and retry.
.It Fl e Ar pkcs11
Remove keys provided by the PKCS#11 shared library
.Ar pkcs11 .
+.It Fl k
+When loading keys into the agent, load plain private keys only and skip
+certificates.
.It Fl L
Lists public key parameters of all identities currently represented
by the agent.