diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-04 11:45:01 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-07 04:33:12 +0200 |
| commit | af889a40ffc113af9105c03d7b32131eb4372d50 (patch) | |
| tree | 3acd6d5a99708fc7fc07740c67c862498b8fa078 /sshconnect.c | |
| parent | upstream: Allow full range of UIDs and GIDs for sftp chown and (diff) | |
| download | openssh-af889a40ffc113af9105c03d7b32131eb4372d50.tar.xz openssh-af889a40ffc113af9105c03d7b32131eb4372d50.zip | |
upstream: when ordering host key algorithms in the client, consider
the ECDSA key subtype; ok markus@
OpenBSD-Commit-ID: 3097686f853c61ff61772ea35f8b699931392ece
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index b87dc0993..31e012df2 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.334 2020/10/03 09:22:26 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.335 2020/10/04 09:45:01 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1336,7 +1336,8 @@ show_other_keys(struct hostkeys *hostkeys, struct sshkey *key) for (i = 0; type[i] != -1; i++) { if (type[i] == key->type) continue; - if (!lookup_key_in_hostkeys_by_type(hostkeys, type[i], &found)) + if (!lookup_key_in_hostkeys_by_type(hostkeys, type[i], + -1, &found)) continue; fp = sshkey_fingerprint(found->key, options.fingerprint_hash, SSH_FP_DEFAULT); |