From 398f9ef192d820b67beba01ec234d66faca65775 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 31 Mar 2015 22:57:06 +0000 Subject: upstream commit 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@ --- hostfile.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'hostfile.c') diff --git a/hostfile.c b/hostfile.c index b235795e..d9fdcb87 100644 --- a/hostfile.c +++ b/hostfile.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -242,7 +242,8 @@ record_hostkey(struct hostkey_foreach_line *l, void *_ctx) struct hostkey_entry *tmp; 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); return 0; } @@ -810,7 +811,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx, memcpy(ktype, lineinfo.rawkey, l); ktype[l] = '\0'; lineinfo.keytype = sshkey_type_from_name(ktype); -#ifdef WITH_SSH1 + /* * Assume RSA1 if the first component is a short * decimal number. @@ -818,7 +819,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx, if (lineinfo.keytype == KEY_UNSPEC && l < 8 && strspn(ktype, "0123456789") == l) lineinfo.keytype = KEY_RSA1; -#endif + /* * Check that something other than whitespace follows * the key type. This won't catch all corruption, but -- cgit v1.2.1