- djm@cvs.openbsd.org 2010/11/29 23:45:51

     [auth.c hostfile.c hostfile.h ssh.c ssh_config.5 sshconnect.c]
     [sshconnect.h sshconnect2.c]
     automatically order the hostkeys requested by the client based on
     which hostkeys are already recorded in known_hosts. This avoids
     hostkey warnings when connecting to servers with new ECDSA keys
     that are preferred by default; with markus@

1 files changed, 24 insertions, 6 deletions

diff --git a/hostfile.h b/hostfile.h
index 1d460c1a9..d84d422ff 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.h,v 1.18 2010/03/04 10:36:03 djm Exp $ */
+/* $OpenBSD: hostfile.h,v 1.19 2010/11/29 23:45:51 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -18,12 +18,30 @@ typedef enum {
         HOST_OK, HOST_NEW, HOST_CHANGED, HOST_REVOKED, HOST_FOUND
 }       HostStatus;
 
+typedef enum {
+        MRK_ERROR, MRK_NONE, MRK_REVOKE, MRK_CA
+}       HostkeyMarker;
+
+struct hostkey_entry {
+        char *host;
+        char *file;
+        u_long line;
+        Key *key;
+        HostkeyMarker marker;
+};
+struct hostkeys;
+
+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 *,
+    const struct hostkey_entry **);
+int      lookup_key_in_hostkeys_by_type(struct hostkeys *, int,
+    const struct hostkey_entry **);
+
 int      hostfile_read_key(char **, u_int *, Key *);
-HostStatus check_host_in_hostfile(const char *, const char *,
-            const Key *, Key *, int *);
-int     add_host_to_hostfile(const char *, const char *, const Key *, int);
-int     lookup_key_in_hostfile_by_type(const char *, const char *,
-            int, Key *, int *);
+int      add_host_to_hostfile(const char *, const char *, const Key *, int);
 
 #define HASH_MAGIC      "|1|"
 #define HASH_DELIM      '|'