diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-26 01:14:45 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-01-26 03:25:55 +0100 |
| commit | 74dfc2c859c906eaab1f88a27fd883115ffb928f (patch) | |
| tree | 52ac3b4098fcfb44be171af0099a4d74b38609b8 /clientloop.c | |
| parent | upstream: downgrade error() for missing subsequent known_hosts (diff) | |
| download | openssh-74dfc2c859c906eaab1f88a27fd883115ffb928f.tar.xz openssh-74dfc2c859c906eaab1f88a27fd883115ffb928f.zip | |
upstream: for UpdateHostKeys, don't report errors for unsupported
key types - just ignore them. spotted by and ok dtucker@
OpenBSD-Commit-ID: 91769e443f6197c983932fc8ae9d39948727d473
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c index 0168d1b41..f02fc5811 100644 --- a/clientloop.c +++ b/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 @@ -2112,8 +2112,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); |