upstream commit

unifdef WITH_SSH1 ok markus@

Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7

1 files changed, 1 insertions, 14 deletions

diff --git a/hostfile.c b/hostfile.c
index e23faa969..b8f9cd143 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.68 2017/03/10 04:26:06 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.69 2017/04/30 23:10:43 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -789,20 +789,7 @@ hostkeys_foreach(const char *path, hostkeys_foreach_fn *callback, void *ctx,
                                 break;
                         }
                         if (!hostfile_read_key(&cp, &kbits, lineinfo.key)) {
-#ifdef WITH_SSH1
-                                sshkey_free(lineinfo.key);
-                                lineinfo.key = sshkey_new(KEY_RSA1);
-                                if (lineinfo.key  == NULL) {
-                                        error("%s: sshkey_new fail", __func__);
-                                        r = SSH_ERR_ALLOC_FAIL;
-                                        break;
-                                }
-                                if (!hostfile_read_key(&cp, &kbits,
-                                    lineinfo.key))
-                                        goto bad;
-#else
                                 goto bad;
-#endif
                         }
                         lineinfo.keytype = lineinfo.key->type;
                         lineinfo.comment = cp;