[openssh-commits] [openssh] 04/06: upstream: make struct hostkeys public; I have no idea why I made it

git+noreply at mindrot.org git+noreply at mindrot.org
Tue Jan 26 12:22:01 AEDT 2021


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit dfe18a295542c169ffde8533b3d7fe42088e2de7
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Jan 26 00:51:30 2021 +0000

    upstream: make struct hostkeys public; I have no idea why I made it
    
    opaque originally.
    
    ok markus@
    
    OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3
---
 hostfile.c | 7 +------
 hostfile.h | 7 +++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hostfile.c b/hostfile.c
index b381741a..f5d3dde9 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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 bc828ecc..a24a4e32 100644
--- 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 at 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 *,

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list