diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
| commit | f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51 (patch) | |
| tree | d32fb61cec38c52314210c3459fd436685dacdba /crypto/openssh/ssh-agent.1 | |
| parent | 9e90c870232242ab23aa7d473996f68cb1fe449d (diff) | |
| parent | 02d4c2ac3daa0f36264392972709ccd7676ab3e8 (diff) | |
| download | src-f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51.tar.gz src-f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51.zip | |
Upgrade to OpenSSH 6.5p1.
Notes
Notes:
svn path=/head/; revision=261320
Diffstat (limited to 'crypto/openssh/ssh-agent.1')
| -rw-r--r-- | crypto/openssh/ssh-agent.1 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1 index b14461570b16..2a1c58e6c4e3 100644 --- a/crypto/openssh/ssh-agent.1 +++ b/crypto/openssh/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.53 2010/11/21 01:01:13 djm Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.54 2013/12/07 11:58:46 naddy Exp $ .\" $FreeBSD$ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 21, 2010 +.Dd December 7, 2013 .Dt SSH-AGENT 1 .Os .Sh NAME @@ -54,7 +54,7 @@ .Sh DESCRIPTION .Nm is a program to hold private keys used for public key authentication -(RSA, DSA, ECDSA). +(RSA, DSA, ECDSA, ED25519). The idea is that .Nm is started in the beginning of an X-session or a login session, and @@ -118,7 +118,8 @@ When executed without arguments, adds the files .Pa ~/.ssh/id_rsa , .Pa ~/.ssh/id_dsa , -.Pa ~/.ssh/id_ecdsa +.Pa ~/.ssh/id_ecdsa , +.Pa ~/.ssh/id_ed25519 and .Pa ~/.ssh/identity . If the identity has a passphrase, @@ -193,6 +194,8 @@ Contains the protocol version 1 RSA authentication identity of the user. Contains the protocol version 2 DSA authentication identity of the user. .It Pa ~/.ssh/id_ecdsa Contains the protocol version 2 ECDSA authentication identity of the user. +.It Pa ~/.ssh/id_ed25519 +Contains the protocol version 2 ED25519 authentication identity of the user. .It Pa ~/.ssh/id_rsa Contains the protocol version 2 RSA authentication identity of the user. .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt |