diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-03-31 22:57:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-01 10:00:46 +1100 |
commit | 398f9ef192d820b67beba01ec234d66faca65775 (patch) | |
tree | fd4459b214358bcc9e0fdc6b4f7c070cc84538d3 /hostfile.c | |
parent | 9a47ab80030a31f2d122b8fd95bd48c408b9fcd9 (diff) |
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@
Diffstat (limited to 'hostfile.c')
-rw-r--r-- | hostfile.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hostfile.c b/hostfile.c index b235795e6..d9fdcb872 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hostfile.c,v 1.64 2015/02/16 22:08:57 djm Exp $ */ | 1 | /* $OpenBSD: hostfile.c,v 1.65 2015/03/31 22:57:06 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -242,7 +242,8 @@ record_hostkey(struct hostkey_foreach_line *l, void *_ctx) | |||
242 | struct hostkey_entry *tmp; | 242 | struct hostkey_entry *tmp; |
243 | 243 | ||
244 | if (l->status == HKF_STATUS_INVALID) { | 244 | if (l->status == HKF_STATUS_INVALID) { |
245 | error("%s:%ld: parse error in hostkeys file", | 245 | /* XXX make this verbose() in the future */ |
246 | debug("%s:%ld: parse error in hostkeys file", | ||
246 | l->path, l->linenum); | 247 | l->path, l->linenum); |
247 | return 0; | 248 | return 0; |
248 | } | 249 | } |
@@ -810,7 +811,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx, | |||
810 | memcpy(ktype, lineinfo.rawkey, l); | 811 | memcpy(ktype, lineinfo.rawkey, l); |
811 | ktype[l] = '\0'; | 812 | ktype[l] = '\0'; |
812 | lineinfo.keytype = sshkey_type_from_name(ktype); | 813 | lineinfo.keytype = sshkey_type_from_name(ktype); |
813 | #ifdef WITH_SSH1 | 814 | |
814 | /* | 815 | /* |
815 | * Assume RSA1 if the first component is a short | 816 | * Assume RSA1 if the first component is a short |
816 | * decimal number. | 817 | * decimal number. |
@@ -818,7 +819,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx, | |||
818 | if (lineinfo.keytype == KEY_UNSPEC && l < 8 && | 819 | if (lineinfo.keytype == KEY_UNSPEC && l < 8 && |
819 | strspn(ktype, "0123456789") == l) | 820 | strspn(ktype, "0123456789") == l) |
820 | lineinfo.keytype = KEY_RSA1; | 821 | lineinfo.keytype = KEY_RSA1; |
821 | #endif | 822 | |
822 | /* | 823 | /* |
823 | * Check that something other than whitespace follows | 824 | * Check that something other than whitespace follows |
824 | * the key type. This won't catch all corruption, but | 825 | * the key type. This won't catch all corruption, but |