tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
downgrade error() for known_hosts parse errors to debug()
 to quiet warnings from ssh1 keys present when compiled !ssh1.

also identify ssh1 keys when scanning, even when compiled !ssh1

ok markus@ miod@
This commit is contained in:
djm@openbsd.org 2015-03-31 22:57:06 +00:00 committed by Damien Miller
parent 9a47ab8003
commit 398f9ef192
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hostfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: hostfile.c,v 1.64 2015/02/16 22:08:57 djm Exp $ */ /* $OpenBSD: hostfile.c,v 1.65 2015/03/31 22:57:06 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
@ -242,7 +242,8 @@ record_hostkey(struct hostkey_foreach_line *l, void *_ctx)
struct hostkey_entry *tmp; struct hostkey_entry *tmp;
if (l->status == HKF_STATUS_INVALID) { if (l->status == HKF_STATUS_INVALID) {
error("%s:%ld: parse error in hostkeys file", /* XXX make this verbose() in the future */
debug("%s:%ld: parse error in hostkeys file",
l->path, l->linenum); l->path, l->linenum);
return 0; return 0;
} }
@ -810,7 +811,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
memcpy(ktype, lineinfo.rawkey, l); memcpy(ktype, lineinfo.rawkey, l);
ktype[l] = '\0'; ktype[l] = '\0';
lineinfo.keytype = sshkey_type_from_name(ktype); lineinfo.keytype = sshkey_type_from_name(ktype);
#ifdef WITH_SSH1
/* /*
* Assume RSA1 if the first component is a short * Assume RSA1 if the first component is a short
* decimal number. * decimal number.
@ -818,7 +819,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
if (lineinfo.keytype == KEY_UNSPEC && l < 8 && if (lineinfo.keytype == KEY_UNSPEC && l < 8 &&
strspn(ktype, "0123456789") == l) strspn(ktype, "0123456789") == l)
lineinfo.keytype = KEY_RSA1; lineinfo.keytype = KEY_RSA1;
#endif
/* /*
* Check that something other than whitespace follows * Check that something other than whitespace follows
* the key type. This won't catch all corruption, but * the key type. This won't catch all corruption, but