summaryrefslogtreecommitdiff
path: root/ssh-agent.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-agent.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-agent.1')
-rw-r--r--ssh-agent.111
1 files changed, 7 insertions, 4 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1
index bb801c902..281ecbdcf 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.53 2010/11/21 01:01:13 djm Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.54 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
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.Dd $Mdocdate: November 21 2010 $ 37.Dd $Mdocdate: December 7 2013 $
38.Dt SSH-AGENT 1 38.Dt SSH-AGENT 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -53,7 +53,7 @@
53.Sh DESCRIPTION 53.Sh DESCRIPTION
54.Nm 54.Nm
55is a program to hold private keys used for public key authentication 55is a program to hold private keys used for public key authentication
56(RSA, DSA, ECDSA). 56(RSA, DSA, ECDSA, ED25519).
57The idea is that 57The idea is that
58.Nm 58.Nm
59is started in the beginning of an X-session or a login session, and 59is started in the beginning of an X-session or a login session, and
@@ -115,7 +115,8 @@ When executed without arguments,
115adds the files 115adds the files
116.Pa ~/.ssh/id_rsa , 116.Pa ~/.ssh/id_rsa ,
117.Pa ~/.ssh/id_dsa , 117.Pa ~/.ssh/id_dsa ,
118.Pa ~/.ssh/id_ecdsa 118.Pa ~/.ssh/id_ecdsa ,
119.Pa ~/.ssh/id_ed25519
119and 120and
120.Pa ~/.ssh/identity . 121.Pa ~/.ssh/identity .
121If the identity has a passphrase, 122If the identity has a passphrase,
@@ -190,6 +191,8 @@ Contains the protocol version 1 RSA authentication identity of the user.
190Contains the protocol version 2 DSA authentication identity of the user. 191Contains the protocol version 2 DSA authentication identity of the user.
191.It Pa ~/.ssh/id_ecdsa 192.It Pa ~/.ssh/id_ecdsa
192Contains the protocol version 2 ECDSA authentication identity of the user. 193Contains the protocol version 2 ECDSA authentication identity of the user.
194.It Pa ~/.ssh/id_ed25519
195Contains the protocol version 2 ED25519 authentication identity of the user.
193.It Pa ~/.ssh/id_rsa 196.It Pa ~/.ssh/id_rsa
194Contains the protocol version 2 RSA authentication identity of the user. 197Contains the protocol version 2 RSA authentication identity of the user.
195.It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt 198.It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt