1 files changed, 4 insertions, 4 deletions

diff --git a/authfile.c b/authfile.c
index 728b136a7..58f589a47 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.114 2015/04/17 13:32:09 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.116 2015/07/09 09:49:46 markus Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -39,13 +39,13 @@
 #include <limits.h>
 
 #include "cipher.h"
-#include "key.h"
 #include "ssh.h"
 #include "log.h"
 #include "authfile.h"
 #include "rsa.h"
 #include "misc.h"
 #include "atomicio.h"
+#include "sshkey.h"
 #include "sshbuf.h"
 #include "ssherr.h"
 #include "krl.h"
@@ -448,8 +448,8 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase,
         case KEY_RSA:
         case KEY_DSA:
         case KEY_ECDSA:
-        case KEY_ED25519:
 #endif /* WITH_OPENSSL */
+        case KEY_ED25519:
         case KEY_UNSPEC:
                 break;
         default:
@@ -467,7 +467,7 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase,
                 goto out;
         }
 
-        if ((r = sshkey_to_certified(key, sshkey_cert_is_legacy(cert))) != 0 ||
+        if ((r = sshkey_to_certified(key)) != 0 ||
             (r = sshkey_cert_copy(cert, key)) != 0)
                 goto out;
         r = 0;