diff options
| author |   djm <djm@openbsd.org> | 2020-10-04 09:45:01 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-10-04 09:45:01 +0000 |
| commit | de42607067f3facbc145b9eacb37d333e8035f95 (patch) | |
| tree | 5f9f94a54e867adb4b1a3d5fe16ee141c29c6c95 /usr.bin/ssh/sshconnect.c | |
| parent | Fix indent (diff) | |
| download | wireguard-openbsd-de42607067f3facbc145b9eacb37d333e8035f95.tar.xz wireguard-openbsd-de42607067f3facbc145b9eacb37d333e8035f95.zip | |
when ordering host key algorithms in the client, consider the ECDSA
key subtype; ok markus@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 54fab745321..31f28ebc679 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/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 @@ -1298,7 +1298,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); |