diff options
| author |   djm <djm@openbsd.org> | 2015-01-26 06:10:03 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-01-26 06:10:03 +0000 |
| commit | 3482e0682edd6eb30695936bb3ab094c65412449 (patch) | |
| tree | f83899506f348b5e38060912fd066fc4878f7696 /usr.bin/ssh/sshconnect.c | |
| parent | Oops: symlinkat()'s 'atfd' argument is its second, not its first (diff) | |
| download | wireguard-openbsd-3482e0682edd6eb30695936bb3ab094c65412449.tar.xz wireguard-openbsd-3482e0682edd6eb30695936bb3ab094c65412449.zip | |
correctly match ECDSA subtype (== curve) for offered/recevied
host keys. Fixes connection-killing host key mismatches when
a server offers multiple ECDSA keys with different curve type
(an extremely unlikely configuration).
ok markus, "looks mechanical" deraadt@
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 ab65e58a2f4..0b19421002f 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.257 2015/01/26 03:04:46 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.258 2015/01/26 06:10:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1217,7 +1217,8 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) goto out; } - debug("Server host key: %s %s", sshkey_type(host_key), fp); + debug("Server host key: %s %s", + compat20 ? sshkey_ssh_name(host_key) : sshkey_type(host_key), fp); if (sshkey_equal(previous_host_key, host_key)) { debug2("%s: server host key %s %s matches cached key", |