From aeb55fdd8a82f5a5e58655423f23667b3bafd475 Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 26 Jan 2021 00:51:30 +0000 Subject: [PATCH] make struct hostkeys public; I have no idea why I made it opaque originally. ok markus@ --- usr.bin/ssh/hostfile.c | 7 +------ usr.bin/ssh/hostfile.h | 7 +++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/usr.bin/ssh/hostfile.c b/usr.bin/ssh/hostfile.c index 287ea1a35b7..34fa85c9ba9 100644 --- a/usr.bin/ssh/hostfile.c +++ b/usr.bin/ssh/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -61,11 +61,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/usr.bin/ssh/hostfile.h b/usr.bin/ssh/hostfile.h index bc828eccf08..a24a4e32905 100644 --- a/usr.bin/ssh/hostfile.h +++ b/usr.bin/ssh/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 @@ -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 *, -- 2.20.1