Import openssh_7.6p1.orig.tar.gz

1 files changed, 7 insertions, 27 deletions

diff --git a/compat.c b/compat.c
index 1e80cfa9a..d82135e2b 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.104 2017/07/25 09:22:25 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -39,24 +39,8 @@
 #include "match.h"
 #include "kex.h"
 
-int compat13 = 0;
-int compat20 = 0;
 int datafellows = 0;
 
-void
-enable_compat20(void)
-{
-        if (compat20)
-                return;
-        debug("Enabling compatibility mode for protocol 2.0");
-        compat20 = 1;
-}
-void
-enable_compat13(void)
-{
-        debug("Enabling compatibility mode for protocol 1.3");
-        compat13 = 1;
-}
 /* datafellows bug compatibility */
 u_int
 compat_datafellows(const char *version)
@@ -193,9 +177,12 @@ compat_datafellows(const char *version)
                   "TTSSH/2.72*",        SSH_BUG_HOSTKEYS },
                 { "WinSCP_release_4*,"
                   "WinSCP_release_5.0*,"
-                  "WinSCP_release_5.1*,"
-                  "WinSCP_release_5.5*,"
-                  "WinSCP_release_5.6*,"
+                  "WinSCP_release_5.1,"
+                  "WinSCP_release_5.1.*,"
+                  "WinSCP_release_5.5,"
+                  "WinSCP_release_5.5.*,"
+                  "WinSCP_release_5.6,"
+                  "WinSCP_release_5.6.*,"
                   "WinSCP_release_5.7,"
                   "WinSCP_release_5.7.1,"
                   "WinSCP_release_5.7.2,"
@@ -232,13 +219,6 @@ proto_spec(const char *spec)
                 return ret;
         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;
                         break;