summaryrefslogtreecommitdiff
path: root/hostfile.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-05-13 09:52:41 +0000
committerDamien Miller <djm@mindrot.org>2020-05-27 10:09:18 +1000
commit05a651400da6fbe12296c34e3d3bcf09f034fbbf (patch)
tree6d32fe8e5a0d61d5016adae80c759734e8def3aa /hostfile.h
parent829451815ec207e14bd54ff5cf7e22046816f042 (diff)
upstream: when ordering the hostkey algorithms to request from a
server, prefer certificate types if the known_hosts files contain a key marked as a @cert-authority; bz#3157 ok markus@ OpenBSD-Commit-ID: 8f194573e5bb7c01b69bbfaabc68f27c9fa5e0db
Diffstat (limited to 'hostfile.h')
-rw-r--r--hostfile.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/hostfile.h b/hostfile.h
index bd2104373..49fcbb7e8 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: hostfile.h,v 1.24 2015/02/16 22:08:57 djm Exp $ */ 1/* $OpenBSD: hostfile.h,v 1.25 2020/05/13 09:52:41 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -39,6 +39,7 @@ HostStatus check_key_in_hostkeys(struct hostkeys *, struct sshkey *,
39 const struct hostkey_entry **); 39 const struct hostkey_entry **);
40int lookup_key_in_hostkeys_by_type(struct hostkeys *, int, 40int lookup_key_in_hostkeys_by_type(struct hostkeys *, int,
41 const struct hostkey_entry **); 41 const struct hostkey_entry **);
42int lookup_marker_in_hostkeys(struct hostkeys *, int);
42 43
43int hostfile_read_key(char **, u_int *, struct sshkey *); 44int hostfile_read_key(char **, u_int *, struct sshkey *);
44int add_host_to_hostfile(const char *, const char *, 45int add_host_to_hostfile(const char *, const char *,