1 files changed, 4 insertions, 4 deletions

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 9a6653c7c..6bde8ad17 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.37 2013/05/17 00:13:14 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 */
@@ -179,7 +180,6 @@ main(int argc, char **argv)
         permanently_set_uid(pw);
 
         seed_rng();
-        arc4random_stir();
 
 #ifdef DEBUG_SSH_KEYSIGN
         log_init("ssh-keysign", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 0);
@@ -187,7 +187,7 @@ main(int argc, char **argv)
 
         /* verify that ssh-keysign is enabled by the admin */
         initialize_options(&options);
-        (void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0);
+        (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw, "", &options, 0);
         fill_default_options(&options);
         if (options.enable_ssh_keysign != 1)
                 fatal("ssh-keysign not enabled in %s",