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

opaque originally.

ok markus@

OpenBSD-Commit-ID: e50780b34d4bbe628d69b2405b024dd749d982f3
This commit is contained in:
djm@openbsd.org 2021-01-26 00:51:30 +00:00 committed by Damien Miller
parent 3b44f2513c
commit dfe18a2955
2 changed files with 6 additions and 8 deletions

View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -63,11 +63,6 @@
#include "hmac.h" #include "hmac.h"
#include "sshbuf.h" #include "sshbuf.h"
struct hostkeys {
struct hostkey_entry *entries;
u_int num_entries;
};
/* XXX hmac is too easy to dictionary attack; use bcrypt? */ /* XXX hmac is too easy to dictionary attack; use bcrypt? */
static int static int

View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -30,7 +30,10 @@ struct hostkey_entry {
HostkeyMarker marker; HostkeyMarker marker;
u_int note; /* caller-specific note/flag */ u_int note; /* caller-specific note/flag */
}; };
struct hostkeys; struct hostkeys {
struct hostkey_entry *entries;
u_int num_entries;
};
struct hostkeys *init_hostkeys(void); struct hostkeys *init_hostkeys(void);
void load_hostkeys(struct hostkeys *, const char *, void load_hostkeys(struct hostkeys *, const char *,