tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: for UpdateHostKeys, don't report errors for unsupported 

key types - just ignore them. spotted by and ok dtucker@

OpenBSD-Commit-ID: 91769e443f6197c983932fc8ae9d39948727d473
This commit is contained in:
djm@openbsd.org 2020-01-26 00:14:45 +00:00 committed by Darren Tucker
parent b59618246c
commit 74dfc2c859
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2112,8 +2112,10 @@ client_input_hostkeys(struct ssh *ssh)
goto out; goto out;
} }
if ((r = sshkey_from_blob(blob, len, &key)) != 0) { if ((r = sshkey_from_blob(blob, len, &key)) != 0) {
error("%s: parse key: %s", __func__, ssh_err(r)); do_log2(r == SSH_ERR_KEY_TYPE_UNKNOWN ?
goto out; SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_ERROR,
"%s: parse key: %s", __func__, ssh_err(r));
continue;
} }
fp = sshkey_fingerprint(key, options.fingerprint_hash, fp = sshkey_fingerprint(key, options.fingerprint_hash,
SSH_FP_DEFAULT); SSH_FP_DEFAULT);