Import openssh_6.5p1.orig.tar.gz

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
 
 DESCRIPTION
      ssh-agent is a program to hold private keys used for public key
-     authentication (RSA, DSA, ECDSA).  The idea is that ssh-agent is started
-     in the beginning of an X-session or a login session, and all other
-     windows or programs are started as clients to the ssh-agent program.
-     Through use of environment variables the agent can be located and
-     automatically used for authentication when logging in to other machines
-     using ssh(1).
+     authentication (RSA, DSA, ECDSA, ED25519).  The idea is that ssh-agent is
+     started in the beginning of an X-session or a login session, and all
+     other windows or programs are started as clients to the ssh-agent
+     program.  Through use of environment variables the agent can be located
+     and automatically used for authentication when logging in to other
+     machines using ssh(1).
 
      The options are as follows:
 
@@ -46,13 +46,14 @@ DESCRIPTION
 
      The agent initially does not have any private keys.  Keys are added using
      ssh-add(1).  When executed without arguments, ssh-add(1) adds the files
-     ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa and ~/.ssh/identity.  If
-     the identity has a passphrase, ssh-add(1) asks for the passphrase on the
-     terminal if it has one or from a small X11 program if running under X11.
-     If neither of these is the case then the authentication will fail.  It
-     then sends the identity to the agent.  Several identities can be stored
-     in the agent; the agent can automatically use any of these identities.
-     ssh-add -l displays the identities currently held by the agent.
+     ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa, ~/.ssh/id_ed25519 and
+     ~/.ssh/identity.  If the identity has a passphrase, ssh-add(1) asks for
+     the passphrase on the terminal if it has one or from a small X11 program
+     if running under X11.  If neither of these is the case then the
+     authentication will fail.  It then sends the identity to the agent.
+     Several identities can be stored in the agent; the agent can
+     automatically use any of these identities.  ssh-add -l displays the
+     identities currently held by the agent.
 
      The idea is that the agent is run in the user's local PC, laptop, or
      terminal.  Authentication data need not be stored on any other machine,
@@ -100,6 +101,10 @@ FILES
              Contains the protocol version 2 ECDSA authentication identity of
              the user.
 
+     ~/.ssh/id_ed25519
+             Contains the protocol version 2 ED25519 authentication identity
+             of the user.
+
      ~/.ssh/id_rsa
              Contains the protocol version 2 RSA authentication identity of
              the user.
@@ -120,4 +125,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 5.4                    November 21, 2010                   OpenBSD 5.4
+OpenBSD 5.4                    December 7, 2013                    OpenBSD 5.4