diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-29 07:50:15 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-29 07:50:15 +0100 |
| commit | b9a95490daa04cc307589897f95bfaff324ad2c9 (patch) | |
| tree | b2acf9d6ded71142558d7af4e1d74c07fa31d0fa | |
| parent | - djm@cvs.openbsd.org 2013/12/29 04:29:25 (diff) | |
| download | openssh-b9a95490daa04cc307589897f95bfaff324ad2c9.tar.xz openssh-b9a95490daa04cc307589897f95bfaff324ad2c9.zip | |
- djm@cvs.openbsd.org 2013/12/29 04:35:50
[authfile.c]
don't refuse to load Ed25519 certificates
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | authfile.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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__); |