diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
commit | 2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch) | |
tree | c4fb7d1f51fa51e7677232de806aae150e29e2ac /ssh-add.1 | |
parent | f5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff) | |
parent | ecebda56da46a03dafff923d91c382f31faa9eec (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.1 | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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. | |||
102 | Instead of adding identities, removes identities from the agent. | 102 | Instead of adding identities, removes identities from the agent. |
103 | If | 103 | If |
104 | .Nm | 104 | .Nm |
105 | has been run without arguments, the keys for the default identities will | 105 | has been run without arguments, the keys for the default identities and |
106 | be removed. | 106 | their corresponding certificates will be removed. |
107 | Otherwise, the argument list will be interpreted as a list of paths to | 107 | Otherwise, the argument list will be interpreted as a list of paths to |
108 | public key files and matching keys will be removed from the agent. | 108 | public key files to specify keys and certificates to be removed from the agent. |
109 | If no public key is found at a given path, | 109 | If no public key is found at a given path, |
110 | .Nm | 110 | .Nm |
111 | will append | 111 | will append |
@@ -115,8 +115,8 @@ and retry. | |||
115 | Remove keys provided by the PKCS#11 shared library | 115 | Remove keys provided by the PKCS#11 shared library |
116 | .Ar pkcs11 . | 116 | .Ar pkcs11 . |
117 | .It Fl k | 117 | .It Fl k |
118 | When loading keys into the agent, load plain private keys only and skip | 118 | When loading keys into or deleting keys from the agent, process plain private |
119 | certificates. | 119 | keys only and skip certificates. |
120 | .It Fl L | 120 | .It Fl L |
121 | Lists public key parameters of all identities currently represented | 121 | Lists public key parameters of all identities currently represented |
122 | by the agent. | 122 | by the agent. |