upstream commit

unifdef WITH_SSH1 ok markus@

Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7

1 files changed, 1 insertions, 9 deletions

diff --git a/ssh.c b/ssh.c
index 5db6ff25e..38c8e837f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.452 2017/04/28 03:20:27 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.453 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
@@ -690,11 +690,7 @@ main(int ac, char **av)
                         else if (strcmp(optarg, "key-plain") == 0)
                                 cp = sshkey_alg_list(0, 1, 0, '\n');
                         else if (strcmp(optarg, "protocol-version") == 0) {
-#ifdef WITH_SSH1
-                                cp = xstrdup("1\n2");
-#else
                                 cp = xstrdup("2");
-#endif
                         }
                         if (cp == NULL)
                                 fatal("Unsupported query \"%s\"", optarg);
@@ -1304,10 +1300,6 @@ main(int ac, char **av)
                         sensitive_data.keys[i] = NULL;
 
                 PRIV_START;
-#if WITH_SSH1
-                sensitive_data.keys[0] = key_load_private_type(KEY_RSA1,
-                    _PATH_HOST_KEY_FILE, "", NULL, NULL);
-#endif
 #ifdef OPENSSL_HAS_ECC
                 sensitive_data.keys[1] = key_load_private_cert(KEY_ECDSA,
                     _PATH_HOST_ECDSA_KEY_FILE, "", NULL);