upstream commit

unifdef WITH_SSH1 ok markus@

Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7

1 files changed, 1 insertions, 6 deletions

diff --git a/compat.c b/compat.c
index 1e80cfa9a..aa50d2ce8 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.100 2017/02/03 23:01:19 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.101 2017/04/30 23:10:43 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -233,11 +233,6 @@ proto_spec(const char *spec)
         for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
                 switch (atoi(p)) {
                 case 1:
-#ifdef WITH_SSH1
-                        if (ret == SSH_PROTO_UNKNOWN)
-                                ret |= SSH_PROTO_1_PREFERRED;
-                        ret |= SSH_PROTO_1;
-#endif
                         break;
                 case 2:
                         ret |= SSH_PROTO_2;