upstream: make struct hostkeys public; I have no idea why I made it

opaque originally.

ok markus@

OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3

diff --git a/hostfile.c b/hostfile.c
index b381741af2d30179da6d1c73009af92973ce88d2..f5d3dde9b3252bfae93c2b16d81e63a27d9981a2 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.88 2021/01/26 00:49:30 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.89 2021/01/26 00:51:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -63,11 +63,6 @@
 #include "hmac.h"
 #include "sshbuf.h"
 
-struct hostkeys {
-       struct hostkey_entry *entries;
-       u_int num_entries;
-};
-
 /* XXX hmac is too easy to dictionary attack; use bcrypt? */
 
 static int

diff --git a/hostfile.h b/hostfile.h
index bc828eccf08752a8a549e17bdecbc2513d44a80a..a24a4e3290597ec91270209f7adb5d5c04c6f821 100644 (file)
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.h,v 1.28 2020/12/20 23:36:51 djm Exp $ */
+/* $OpenBSD: hostfile.h,v 1.29 2021/01/26 00:51:30 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -30,7 +30,10 @@ struct hostkey_entry {
        HostkeyMarker marker;
        u_int note; /* caller-specific note/flag */
 };
-struct hostkeys;
+struct hostkeys {
+       struct hostkey_entry *entries;
+       u_int num_entries;
+};
 
 struct hostkeys *init_hostkeys(void);
 void    load_hostkeys(struct hostkeys *, const char *,