summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-18 17:46:27 +1100
committerDamien Miller <djm@mindrot.org>2013-12-18 17:46:27 +1100
commit8ba0ead6985ea14999265136b14ffd5aeec516f9 (patch)
tree1fdf16c075d97bbcbe5548ce8ec2082d04d3925c /ssh-add.1
parent4f752cf71cf44bf4bc777541156c2bf56daf9ce9 (diff)
- naddy@cvs.openbsd.org 2013/12/07 11:58:46
[ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1] [ssh_config.5 sshd.8 sshd_config.5] add missing mentions of ed25519; ok djm@
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 44846b67e..4812448fa 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.58 2012/12/03 08:33:02 jmc Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.59 2013/12/07 11:58:46 naddy 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: December 3 2012 $ 38.Dd $Mdocdate: December 7 2013 $
39.Dt SSH-ADD 1 39.Dt SSH-ADD 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -57,7 +57,8 @@ adds private key identities to the authentication agent,
57When run without arguments, it adds the files 57When run without arguments, it adds the files
58.Pa ~/.ssh/id_rsa , 58.Pa ~/.ssh/id_rsa ,
59.Pa ~/.ssh/id_dsa , 59.Pa ~/.ssh/id_dsa ,
60.Pa ~/.ssh/id_ecdsa 60.Pa ~/.ssh/id_ecdsa ,
61.Pa ~/.ssh/id_ed25519
61and 62and
62.Pa ~/.ssh/identity . 63.Pa ~/.ssh/identity .
63After loading a private key, 64After loading a private key,
@@ -169,6 +170,8 @@ Contains the protocol version 1 RSA authentication identity of the user.
169Contains the protocol version 2 DSA authentication identity of the user. 170Contains the protocol version 2 DSA authentication identity of the user.
170.It Pa ~/.ssh/id_ecdsa 171.It Pa ~/.ssh/id_ecdsa
171Contains the protocol version 2 ECDSA authentication identity of the user. 172Contains the protocol version 2 ECDSA authentication identity of the user.
173.It Pa ~/.ssh/id_ed25519
174Contains the protocol version 2 ED25519 authentication identity of the user.
172.It Pa ~/.ssh/id_rsa 175.It Pa ~/.ssh/id_rsa
173Contains the protocol version 2 RSA authentication identity of the user. 176Contains the protocol version 2 RSA authentication identity of the user.
174.El 177.El