- markus@cvs.openbsd.org 2013/12/06 13:39:49

     [authfd.c authfile.c key.c key.h myproposal.h pathnames.h readconf.c]
     [servconf.c ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]
     [ssh-keysign.c ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]
     [sc25519.h sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]
     [fe25519.h fe25519.c ed25519.c crypto_api.h blocks.c]
     support ed25519 keys (hostkeys and user identities) using the public
     domain ed25519 reference code from SUPERCOP, see
     http://ed25519.cr.yp.to/software.html
     feedback, help & ok djm@

1 files changed, 3 insertions, 2 deletions

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 518373bf8..6bde8ad17 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.38 2013/10/14 22:22:04 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.39 2013/12/06 13:39:49 markus Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -150,7 +150,7 @@ main(int argc, char **argv)
 {
         Buffer b;
         Options options;
-#define NUM_KEYTYPES 3
+#define NUM_KEYTYPES 4
         Key *keys[NUM_KEYTYPES], *key = NULL;
         struct passwd *pw;
         int key_fd[NUM_KEYTYPES], i, found, version = 2, fd;
@@ -169,6 +169,7 @@ main(int argc, char **argv)
         i = 0;
         key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY);
+        key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
 
         original_real_uid = getuid();   /* XXX readconf.c needs this */