diff options
| author |   djm <djm@openbsd.org> | 2020-01-26 00:14:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-26 00:14:45 +0000 |
| commit | 0306c1d0956aed19fe0c06535ad5d1914492625e (patch) | |
| tree | b420666260d68ed25fe9fed81f1d87603d3e9edc | |
| parent | downgrade error() for missing subsequent known_hosts files to debug() (diff) | |
| download | wireguard-openbsd-0306c1d0956aed19fe0c06535ad5d1914492625e.tar.xz wireguard-openbsd-0306c1d0956aed19fe0c06535ad5d1914492625e.zip | |
for UpdateHostKeys, don't report errors for unsupported key types -
just ignore them. spotted by and ok dtucker@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index b95c16f3e4d..9bf69b1f74d 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.334 2020/01/26 00:13:20 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.335 2020/01/26 00:14:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2098,8 +2098,10 @@ client_input_hostkeys(struct ssh *ssh) goto out; } if ((r = sshkey_from_blob(blob, len, &key)) != 0) { - error("%s: parse key: %s", __func__, ssh_err(r)); - goto out; + do_log2(r == SSH_ERR_KEY_TYPE_UNKNOWN ? + SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_ERROR, + "%s: parse key: %s", __func__, ssh_err(r)); + continue; } fp = sshkey_fingerprint(key, options.fingerprint_hash, SSH_FP_DEFAULT); |