From b9a95490daa04cc307589897f95bfaff324ad2c9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 29 Dec 2013 17:50:15 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2013/12/29 04:35:50 [authfile.c] don't refuse to load Ed25519 certificates --- ChangeLog | 3 +++ authfile.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e85c79f1..3721d3d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,9 @@ - djm@cvs.openbsd.org 2013/12/29 04:29:25 [authfd.c] allow deletion of ed25519 keys from the agent + - djm@cvs.openbsd.org 2013/12/29 04:35:50 + [authfile.c] + don't refuse to load Ed25519 certificates 20131221 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. diff --git a/authfile.c b/authfile.c index 3bbc7cbb8..7eccbb2c9 100644 --- a/authfile.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1213,6 +1213,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__);