From: djm <djm@openbsd.org>
Date: Sun, 29 Dec 2013 02:28:10 +0000 (+0000)
Subject: allow ed25519 keys to appear as certificate authorities
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5a2ee4777addd6fece2d4faf9597176846ed9f85;p=openbsd

allow ed25519 keys to appear as certificate authorities
---

diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c
index c5732709033..18393aacdbf 100644
--- a/usr.bin/ssh/key.c
+++ b/usr.bin/ssh/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.110 2013/12/07 00:19:15 djm Exp $ */
+/* $OpenBSD: key.c,v 1.111 2013/12/29 02:28:10 djm Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1433,7 +1433,8 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen)
 	}
 	if (key->cert->signature_key->type != KEY_RSA &&
 	    key->cert->signature_key->type != KEY_DSA &&
-	    key->cert->signature_key->type != KEY_ECDSA) {
+	    key->cert->signature_key->type != KEY_ECDSA &&
+	    key->cert->signature_key->type != KEY_ED25519) {
 		error("%s: Invalid signature key type %s (%d)", __func__,
 		    key_type(key->cert->signature_key),
 		    key->cert->signature_key->type);