summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2013-12-29 04:35:51 +0000
committerDamien Miller <djm@cvs.openbsd.org>2013-12-29 04:35:51 +0000
commit4b055c9ec404638ea3a9c8581e6c931ef18997b5 (patch)
treec663db1e7dbc10450203995596bd7210a6301d97 /usr.bin
parent21e7fe8ec2c16ea8460b21b17f2dcfdfff554edb (diff)
don't refuse to load Ed25519 certificates
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/authfile.c3
1 files changed, 2 insertions, 1 deletions
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__);