summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-07 11:47:26 +0100
committerColin Watson <cjwatson@debian.org>2013-05-07 11:47:26 +0100
commit2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch)
treec4fb7d1f51fa51e7677232de806aae150e29e2ac /ssh-add.1
parentf5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff)
parentecebda56da46a03dafff923d91c382f31faa9eec (diff)
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via an AuthenticationMethods option (closes: #195716). - Fix Sophie Germain formula in moduli(5) (closes: #698612). - Update ssh-copy-id to Phil Hands' greatly revised version (closes: #99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'ssh-add.1')
-rw-r--r--ssh-add.114
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 64e21bb51..d394b2696 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.56 2011/10/18 05:00:48 djm Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.58 2012/12/03 08:33:02 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: October 18 2011 $ 38.Dd $Mdocdate: December 3 2012 $
39.Dt SSH-ADD 1 39.Dt SSH-ADD 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -102,10 +102,10 @@ Deletes all identities from the agent.
102Instead of adding identities, removes identities from the agent. 102Instead of adding identities, removes identities from the agent.
103If 103If
104.Nm 104.Nm
105has been run without arguments, the keys for the default identities will 105has been run without arguments, the keys for the default identities and
106be removed. 106their corresponding certificates will be removed.
107Otherwise, the argument list will be interpreted as a list of paths to 107Otherwise, the argument list will be interpreted as a list of paths to
108public key files and matching keys will be removed from the agent. 108public key files to specify keys and certificates to be removed from the agent.
109If no public key is found at a given path, 109If no public key is found at a given path,
110.Nm 110.Nm
111will append 111will append
@@ -115,8 +115,8 @@ and retry.
115Remove keys provided by the PKCS#11 shared library 115Remove keys provided by the PKCS#11 shared library
116.Ar pkcs11 . 116.Ar pkcs11 .
117.It Fl k 117.It Fl k
118When loading keys into the agent, load plain private keys only and skip 118When loading keys into or deleting keys from the agent, process plain private
119certificates. 119keys only and skip certificates.
120.It Fl L 120.It Fl L
121Lists public key parameters of all identities currently represented 121Lists public key parameters of all identities currently represented
122by the agent. 122by the agent.