diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:18:28 +0000 |
commit | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 (patch) | |
tree | 764a885ec9a963f6a8b15de6e1765f16b9ac4738 /ssh-agent.0 | |
parent | ee196dab7c5f97f0b80c8099343a375bead92010 (diff) | |
parent | cdb6c90811caa5df2df856be9b0b16db020fe31d (diff) |
Import openssh_6.5p1.orig.tar.gz
Diffstat (limited to 'ssh-agent.0')
-rw-r--r-- | ssh-agent.0 | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0 index e5f0f7342..c4c53ef94 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 | |||
@@ -9,12 +9,12 @@ SYNOPSIS | |||
9 | 9 | ||
10 | DESCRIPTION | 10 | DESCRIPTION |
11 | ssh-agent is a program to hold private keys used for public key | 11 | ssh-agent is a program to hold private keys used for public key |
12 | authentication (RSA, DSA, ECDSA). The idea is that ssh-agent is started | 12 | authentication (RSA, DSA, ECDSA, ED25519). The idea is that ssh-agent is |
13 | in the beginning of an X-session or a login session, and all other | 13 | started in the beginning of an X-session or a login session, and all |
14 | windows or programs are started as clients to the ssh-agent program. | 14 | other windows or programs are started as clients to the ssh-agent |
15 | Through use of environment variables the agent can be located and | 15 | program. Through use of environment variables the agent can be located |
16 | automatically used for authentication when logging in to other machines | 16 | and automatically used for authentication when logging in to other |
17 | using ssh(1). | 17 | machines using ssh(1). |
18 | 18 | ||
19 | The options are as follows: | 19 | The options are as follows: |
20 | 20 | ||
@@ -46,13 +46,14 @@ DESCRIPTION | |||
46 | 46 | ||
47 | The agent initially does not have any private keys. Keys are added using | 47 | The agent initially does not have any private keys. Keys are added using |
48 | ssh-add(1). When executed without arguments, ssh-add(1) adds the files | 48 | ssh-add(1). When executed without arguments, ssh-add(1) adds the files |
49 | ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa and ~/.ssh/identity. If | 49 | ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa, ~/.ssh/id_ed25519 and |
50 | the identity has a passphrase, ssh-add(1) asks for the passphrase on the | 50 | ~/.ssh/identity. If the identity has a passphrase, ssh-add(1) asks for |
51 | terminal if it has one or from a small X11 program if running under X11. | 51 | the passphrase on the terminal if it has one or from a small X11 program |
52 | If neither of these is the case then the authentication will fail. It | 52 | if running under X11. If neither of these is the case then the |
53 | then sends the identity to the agent. Several identities can be stored | 53 | authentication will fail. It then sends the identity to the agent. |
54 | in the agent; the agent can automatically use any of these identities. | 54 | Several identities can be stored in the agent; the agent can |
55 | ssh-add -l displays the identities currently held by the agent. | 55 | automatically use any of these identities. ssh-add -l displays the |
56 | identities currently held by the agent. | ||
56 | 57 | ||
57 | The idea is that the agent is run in the user's local PC, laptop, or | 58 | The idea is that the agent is run in the user's local PC, laptop, or |
58 | terminal. Authentication data need not be stored on any other machine, | 59 | terminal. Authentication data need not be stored on any other machine, |
@@ -100,6 +101,10 @@ FILES | |||
100 | Contains the protocol version 2 ECDSA authentication identity of | 101 | Contains the protocol version 2 ECDSA authentication identity of |
101 | the user. | 102 | the user. |
102 | 103 | ||
104 | ~/.ssh/id_ed25519 | ||
105 | Contains the protocol version 2 ED25519 authentication identity | ||
106 | of the user. | ||
107 | |||
103 | ~/.ssh/id_rsa | 108 | ~/.ssh/id_rsa |
104 | Contains the protocol version 2 RSA authentication identity of | 109 | Contains the protocol version 2 RSA authentication identity of |
105 | the user. | 110 | the user. |
@@ -120,4 +125,4 @@ AUTHORS | |||
120 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 125 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
121 | versions 1.5 and 2.0. | 126 | versions 1.5 and 2.0. |
122 | 127 | ||
123 | OpenBSD 5.4 November 21, 2010 OpenBSD 5.4 | 128 | OpenBSD 5.4 December 7, 2013 OpenBSD 5.4 |