upstream commit

sync ssh-keysign, ssh-keygen and some dependencies to the
 new buffer/key API; mostly mechanical, ok markus@

1 files changed, 6 insertions, 5 deletions

diff --git a/hostfile.h b/hostfile.h
index 679c034f3..d90973f42 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.h,v 1.20 2013/07/12 00:19:58 djm Exp $ */
+/* $OpenBSD: hostfile.h,v 1.21 2015/01/15 09:40:00 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -26,7 +26,7 @@ struct hostkey_entry {
         char *host;
         char *file;
         u_long line;
-        Key *key;
+        struct sshkey *key;
         HostkeyMarker marker;
 };
 struct hostkeys;
@@ -35,13 +35,14 @@ struct hostkeys *init_hostkeys(void);
 void     load_hostkeys(struct hostkeys *, const char *, const char *);
 void     free_hostkeys(struct hostkeys *);
 
-HostStatus check_key_in_hostkeys(struct hostkeys *, Key *,
+HostStatus check_key_in_hostkeys(struct hostkeys *, struct sshkey *,
     const struct hostkey_entry **);
 int      lookup_key_in_hostkeys_by_type(struct hostkeys *, int,
     const struct hostkey_entry **);
 
-int      hostfile_read_key(char **, int *, Key *);
-int      add_host_to_hostfile(const char *, const char *, const Key *, int);
+int      hostfile_read_key(char **, u_int *, struct sshkey *);
+int      add_host_to_hostfile(const char *, const char *,
+    const struct sshkey *, int);
 
 #define HASH_MAGIC      "|1|"
 #define HASH_DELIM      '|'