- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / compat.c

diff --git a/compat.c b/compat.c
index 906547079bba72ec95161f12d3d7f1047f999c46..df3541df70efbd5412b85be6eb4c5cf537b7736d 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,6 @@
+/* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */
 /*
- * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,11 +24,16 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.60 2002/03/06 00:23:27 markus Exp $");
 
+#include <sys/types.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "xmalloc.h"
 #include "buffer.h"
 #include "packet.h"
-#include "xmalloc.h"
 #include "compat.h"
 #include "log.h"
 #include "match.h"
@@ -39,13 +45,13 @@ int datafellows = 0;
 void
 enable_compat20(void)
 {
-       verbose("Enabling compatibility mode for protocol 2.0");
+       debug("Enabling compatibility mode for protocol 2.0");
        compat20 = 1;
 }
 void
 enable_compat13(void)
 {
-       verbose("Enabling compatibility mode for protocol 1.3");
+       debug("Enabling compatibility mode for protocol 1.3");
        compat13 = 1;
 }
 /* datafellows bug compatibility */
@@ -61,28 +67,41 @@ compat_datafellows(const char *version)
                  "OpenSSH-2.1*,"
                  "OpenSSH_2.1*,"
                  "OpenSSH_2.2*",       SSH_OLD_SESSIONID|SSH_BUG_BANNER|
-                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
+                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
+                                       SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
                { "OpenSSH_2.3.0*",     SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES|
-                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY},
+                                       SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
+                                       SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
                { "OpenSSH_2.3.*",      SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                       SSH_BUG_NOREKEY},
+                                       SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                       SSH_OLD_FORWARD_ADDR},
                { "OpenSSH_2.5.0p1*,"
                  "OpenSSH_2.5.1p1*",
                                        SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                       SSH_BUG_NOREKEY },
+                                       SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                       SSH_OLD_FORWARD_ADDR},
                { "OpenSSH_2.5.0*,"
                  "OpenSSH_2.5.1*,"
-                 "OpenSSH_2.5.2*",     SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
-               { "OpenSSH_2.5.3*",
-                                       SSH_BUG_NOREKEY },
-               { "OpenSSH*",           0 },
+                 "OpenSSH_2.5.2*",     SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
+                                       SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
+               { "OpenSSH_2.5.3*",     SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                       SSH_OLD_FORWARD_ADDR},
+               { "OpenSSH_2.*,"
+                 "OpenSSH_3.0*,"
+                 "OpenSSH_3.1*",       SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
+               { "OpenSSH_3.*",        SSH_OLD_FORWARD_ADDR },
+               { "Sun_SSH_1.0*",       SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+               { "OpenSSH_4*",         0 },
+               { "OpenSSH*",           SSH_NEW_OPENSSH },
                { "*MindTerm*",         0 },
                { "2.1.0*",             SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE|
+                                       SSH_BUG_FIRSTKEX },
                { "2.1 *",              SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE|
+                                       SSH_BUG_FIRSTKEX },
                { "2.0.13*,"
                  "2.0.14*,"
                  "2.0.15*,"
@@ -94,26 +113,29 @@ compat_datafellows(const char *version)
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                        SSH_BUG_PKOK|SSH_BUG_RSASIGMD5|
                                        SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE|
-                                       SSH_BUG_DUMMYCHAN },
+                                       SSH_BUG_DUMMYCHAN|SSH_BUG_FIRSTKEX },
                { "2.0.11*,"
                  "2.0.12*",            SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                        SSH_BUG_PKAUTH|SSH_BUG_PKOK|
                                        SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
-                                       SSH_BUG_DUMMYCHAN },
+                                       SSH_BUG_DUMMYCHAN|SSH_BUG_FIRSTKEX },
                { "2.0.*",              SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                        SSH_BUG_PKAUTH|SSH_BUG_PKOK|
                                        SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
-                                       SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN },
+                                       SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN|
+                                       SSH_BUG_FIRSTKEX },
                { "2.2.0*,"
                  "2.3.0*",             SSH_BUG_HMAC|SSH_BUG_DEBUG|
-                                       SSH_BUG_RSASIGMD5 },
-               { "2.3.*",              SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 },
+                                       SSH_BUG_RSASIGMD5|SSH_BUG_FIRSTKEX },
+               { "2.3.*",              SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5|
+                                       SSH_BUG_FIRSTKEX },
                { "2.4",                SSH_OLD_SESSIONID },    /* Van Dyke */
-               { "2.*",                SSH_BUG_DEBUG },
+               { "2.*",                SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX|
+                                       SSH_BUG_RFWD_ADDR },
                { "3.0.*",              SSH_BUG_DEBUG },
                { "3.0 SecureCRT*",     SSH_OLD_SESSIONID },
                { "1.7 SecureFX*",      SSH_OLD_SESSIONID },
@@ -122,7 +144,8 @@ compat_datafellows(const char *version)
                  "1.2.20*,"
                  "1.2.21*,"
                  "1.2.22*",            SSH_BUG_IGNOREMSG },
-               { "1.3.2*",             SSH_BUG_IGNOREMSG },    /* f-secure */
+               { "1.3.2*",             /* F-Secure */
+                                       SSH_BUG_IGNOREMSG },
                { "*SSH Compatible Server*",                    /* Netscreen */
                                        SSH_BUG_PASSWORDPAD },
                { "*OSU_0*,"
@@ -136,6 +159,8 @@ compat_datafellows(const char *version)
                  "OSU_1.5alpha3*",     SSH_BUG_PASSWORDPAD },
                { "*SSH_Version_Mapper*",
                                        SSH_BUG_SCANNER },
+               { "Probe-*",
+                                       SSH_BUG_PROBE },
                { NULL,                 0 }
        };
 
@@ -172,7 +197,7 @@ proto_spec(const char *spec)
                        ret |= SSH_PROTO_2;
                        break;
                default:
-                       log("ignoring bad proto spec: '%s'.", p);
+                       logit("ignoring bad proto spec: '%s'.", p);
                        break;
                }
        }