Import openssh_6.9p1.orig.tar.gz

1 files changed, 39 insertions, 12 deletions

diff --git a/compat.c b/compat.c
index 4852fb709..0631024f0 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.87 2015/01/19 20:20:20 markus Exp $ */
+/* $OpenBSD: compat.c,v 1.94 2015/05/26 23:23:40 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -152,6 +152,7 @@ compat_datafellows(const char *version)
                   "1.2.22*",            SSH_BUG_IGNOREMSG },
                 { "1.3.2*",             /* F-Secure */
                                         SSH_BUG_IGNOREMSG },
+                { "Cisco-1.*",          SSH_BUG_DHGEX_LARGE },
                 { "*SSH Compatible Server*",                    /* Netscreen */
                                         SSH_BUG_PASSWORDPAD },
                 { "*OSU_0*,"
@@ -165,15 +166,34 @@ compat_datafellows(const char *version)
                   "OSU_1.5alpha3*",     SSH_BUG_PASSWORDPAD },
                 { "*SSH_Version_Mapper*",
                                         SSH_BUG_SCANNER },
+                { "PuTTY-Release-0.5*," /* 0.50-0.57, DH-GEX in >=0.52 */
+                  "PuTTY_Release_0.5*," /* 0.58-0.59 */
+                  "PuTTY_Release_0.60*,"
+                  "PuTTY_Release_0.61*,"
+                  "PuTTY_Release_0.62*,"
+                  "PuTTY_Release_0.63*,"
+                  "PuTTY_Release_0.64*",
+                                        SSH_OLD_DHGEX },
                 { "Probe-*",
                                         SSH_BUG_PROBE },
+                { "TeraTerm SSH*,"
+                  "TTSSH/1.5.*,"
+                  "TTSSH/2.1*,"
+                  "TTSSH/2.2*,"
+                  "TTSSH/2.3*,"
+                  "TTSSH/2.4*,"
+                  "TTSSH/2.5*,"
+                  "TTSSH/2.6*,"
+                  "TTSSH/2.70*,"
+                  "TTSSH/2.71*,"
+                  "TTSSH/2.72*",        SSH_BUG_HOSTKEYS },
+                { "WinSCP*",            SSH_OLD_DHGEX },
                 { NULL,                 0 }
         };
 
         /* process table, return first match */
         for (i = 0; check[i].pat; i++) {
-                if (match_pattern_list(version, check[i].pat,
-                    strlen(check[i].pat), 0) == 1) {
+                if (match_pattern_list(version, check[i].pat, 0) == 1) {
                         debug("match: %s pat %s compat 0x%08x",
                             version, check[i].pat, check[i].bugs);
                         datafellows = check[i].bugs;    /* XXX for now */
@@ -199,9 +219,11 @@ 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;
@@ -229,7 +251,7 @@ filter_proposal(char *proposal, const char *filter)
         buffer_init(&b);
         tmp = orig_prop = xstrdup(proposal);
         while ((cp = strsep(&tmp, ",")) != NULL) {
-                if (match_pattern_list(cp, filter, strlen(cp), 0) != 1) {
+                if (match_pattern_list(cp, filter, 0) != 1) {
                         if (buffer_len(&b) > 0)
                                 buffer_append(&b, ",", 1);
                         buffer_append(&b, cp, strlen(cp));
@@ -271,15 +293,20 @@ compat_pkalg_proposal(char *pkalg_prop)
 }
 
 char *
-compat_kex_proposal(char *kex_prop)
+compat_kex_proposal(char *p)
 {
-        if (!(datafellows & SSH_BUG_CURVE25519PAD))
-                return kex_prop;
-        debug2("%s: original KEX proposal: %s", __func__, kex_prop);
-        kex_prop = filter_proposal(kex_prop, "curve25519-sha256@libssh.org");
-        debug2("%s: compat KEX proposal: %s", __func__, kex_prop);
-        if (*kex_prop == '\0')
+        if ((datafellows & (SSH_BUG_CURVE25519PAD|SSH_OLD_DHGEX)) == 0)
+                return p;
+        debug2("%s: original KEX proposal: %s", __func__, p);
+        if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)
+                p = filter_proposal(p, "curve25519-sha256@libssh.org");
+        if ((datafellows & SSH_OLD_DHGEX) != 0) {
+                p = filter_proposal(p, "diffie-hellman-group-exchange-sha256");
+                p = filter_proposal(p, "diffie-hellman-group-exchange-sha1");
+        }
+        debug2("%s: compat KEX proposal: %s", __func__, p);
+        if (*p == '\0')
                 fatal("No supported key exchange algorithms found");
-        return kex_prop;
+        return p;
 }