- djm@cvs.openbsd.org 2013/12/29 04:35:50

     [authfile.c]
     don't refuse to load Ed25519 certificates

diff --git a/ChangeLog b/ChangeLog
index 3e85c79f183bd0cb522e72f7351b46a807783c12..3721d3d656c5297acff49f034a3b52b445aae4d8 100644 (file)
--- 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 3bbc7cbb883a5fbff331f9666cdf2a49d3bde5d8..7eccbb2c993b48fe303f77e1de3075ce9d758859 100644 (file)
--- 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__);