From 5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 7 Dec 2013 11:24:01 +1100
Subject:    - markus@cvs.openbsd.org 2013/12/06 13:39:49      [authfd.c
 authfile.c key.c key.h myproposal.h pathnames.h readconf.c]      [servconf.c
 ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]      [ssh-keysign.c
 ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]      [sc25519.h
 sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]      [fe25519.h
 fe25519.c ed25519.c crypto_api.h blocks.c]      support ed25519 keys
 (hostkeys and user identities) using the public      domain ed25519 reference
 code from SUPERCOP, see      http://ed25519.cr.yp.to/software.html     
 feedback, help & ok djm@

---
 sshd.8 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sshd.8')

diff --git a/sshd.8 b/sshd.8
index b0c7ab6bd..b5d614c50 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.270 2013/06/27 14:05:37 jmc Exp $
-.Dd $Mdocdate: June 27 2013 $
+.\" $OpenBSD: sshd.8,v 1.271 2013/12/06 13:39:49 markus Exp $
+.Dd $Mdocdate: December 6 2013 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -494,6 +494,7 @@ For protocol version 2 the keytype is
 .Dq ecdsa-sha2-nistp256 ,
 .Dq ecdsa-sha2-nistp384 ,
 .Dq ecdsa-sha2-nistp521 ,
+.Dq ssh-ed25519
 .Dq ssh-dss
 or
 .Dq ssh-rsa .
-- 
cgit v1.2.3