diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-12-20 23:36:51 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-21 10:52:28 +1100 |
| commit | b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d (patch) | |
| tree | efcf7641caaa015124a7b5cfd6622a0791ed0c32 /sshconnect2.c | |
| parent | 06fbb386bed666581095cb9cbc7a900e02bfe1b7 (diff) | |
| download | openssh-git-b4c7cd1185c5dc0593d47eafcc1a34fda569dd1d.tar.gz | |
upstream: load_hostkeys()/hostkeys_foreach() variants for FILE*
Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
FILE* argument instead of opening the file directly.
Original load_hostkeys() and hostkeys_foreach() are implemented using
these new interfaces.
Add a u_int note field to the hostkey_entry and hostkey_foreach_line
structs that is passed directly from the load_hostkeys() and
hostkeys_foreach() call. This is a lightweight way to annotate results
between different invocations of load_hostkeys().
ok markus@
OpenBSD-Commit-ID: 6ff6db13ec9ee4edfa658b2c38baad0f505d8c20
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 149bb8d6..afbb8526 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.336 2020/11/13 07:30:44 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.337 2020/12/20 23:36:51 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -129,10 +129,11 @@ order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) get_hostfile_hostname_ipaddr(host, hostaddr, port, &hostname, NULL); hostkeys = init_hostkeys(); for (i = 0; i < options.num_user_hostfiles; i++) - load_hostkeys(hostkeys, hostname, options.user_hostfiles[i]); - for (i = 0; i < options.num_system_hostfiles; i++) - load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); - + load_hostkeys(hostkeys, hostname, options.user_hostfiles[i], 0); + for (i = 0; i < options.num_system_hostfiles; i++) { + load_hostkeys(hostkeys, hostname, + options.system_hostfiles[i], 0); + } /* * If a plain public key exists that matches the type of the best * preference HostkeyAlgorithms, then use the whole list as is. |