From: djm <djm@openbsd.org>
Date: Sun, 29 Dec 2013 04:35:50 +0000 (+0000)
Subject: don't refuse to load Ed25519 certificates
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=93dce1ff92cef6c8a02ef98ff59f992a2b3b30af;p=openbsd

don't refuse to load Ed25519 certificates
---

diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 77594c4e3b1..70bb814fec6 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.100 2013/12/06 13:39:49 markus Exp $ */
+/* $OpenBSD: authfile.c,v 1.101 2013/12/29 04:35:50 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1195,6 +1195,7 @@ key_load_private_cert(int type, const char *filename, const char *passphrase,
 	case KEY_RSA:
 	case KEY_DSA:
 	case KEY_ECDSA:
+	case KEY_ED25519:
 		break;
 	default:
 		error("%s: unsupported key type", __func__);