- markus@cvs.openbsd.org 2003/04/01 10:31:26

     [compat.c compat.h kex.c]
     bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@;
     tested by ho@ and myself

1 files changed, 13 insertions, 9 deletions

diff --git a/compat.c b/compat.c
index 757b0e679..5e1774ab6 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.65 2002/09/27 10:42:09 mickey Exp $");
+RCSID("$OpenBSD: compat.c,v 1.66 2003/04/01 10:31:26 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -85,10 +85,12 @@ compat_datafellows(const char *version)
                 { "*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*,"
@@ -100,26 +102,28 @@ 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 },
                 { "3.0.*",              SSH_BUG_DEBUG },
                 { "3.0 SecureCRT*",     SSH_OLD_SESSIONID },
                 { "1.7 SecureFX*",      SSH_OLD_SESSIONID },