diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-04-30 04:10:49 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-04-30 04:22:35 +0200 |
| commit | 80fb0eb21551aed3aebb009ab20aeffeb01e44e0 (patch) | |
| tree | 6b4515c412eb94b024bed884c920eeaf983fbd69 /sshconnect.h | |
| parent | upstream: correct indentation; no functional change ok tb@ (diff) | |
| download | openssh-80fb0eb21551aed3aebb009ab20aeffeb01e44e0.tar.xz openssh-80fb0eb21551aed3aebb009ab20aeffeb01e44e0.zip | |
upstream: add explict check for server hostkey type against
HostkeyAlgorithms. Allows HostkeyAlgorithms to disable implicit fallback from
certificate keys to plain keys. ok markus@
OpenBSD-Commit-ID: 364087e4a395ff9b2f42bf3aefdb2090bb23643a
Diffstat (limited to 'sshconnect.h')
| -rw-r--r-- | sshconnect.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sshconnect.h b/sshconnect.h index 79d35cc19..8b0466f29 100644 --- a/sshconnect.h +++ b/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.47 2023/10/12 02:18:18 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.48 2024/04/30 02:10:49 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -24,6 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +struct sshkey; + typedef struct Sensitive Sensitive; struct Sensitive { struct sshkey **keys; @@ -94,3 +96,5 @@ void maybe_add_key_to_agent(const char *, struct sshkey *, void load_hostkeys_command(struct hostkeys *, const char *, const char *, const struct ssh_conn_info *, const struct sshkey *, const char *); + +int hostkey_accepted_by_hostkeyalgs(const struct sshkey *); |