- markus@cvs.openbsd.org 2002/03/25 21:13:51

     [channels.c channels.h compat.c compat.h nchan.c]
     don't send stderr data after EOF, accept this from older known (broken)
     sshd servers only, fixes http://bugzilla.mindrot.org/show_bug.cgi?id=179

1 files changed, 14 insertions, 8 deletions

diff --git a/compat.c b/compat.c
index 74d5ed85e..8671e641b 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.61 2002/03/06 00:24:39 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.62 2002/03/25 21:13:51 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -61,20 +61,26 @@ 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},
                 { "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},
                 { "OpenSSH_2.3.*",      SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                        SSH_BUG_NOREKEY},
+                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
                 { "OpenSSH_2.5.0p1*,"
                   "OpenSSH_2.5.1p1*",
                                         SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                        SSH_BUG_NOREKEY },
+                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
                 { "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 },
-                { "Sun_SSH_1.0*",       SSH_BUG_NOREKEY },
+                  "OpenSSH_2.5.2*",     SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
+                                        SSH_BUG_EXTEOF},
+                { "OpenSSH_2.5.3*",     SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+                { "OpenSSH_2.*,"
+                  "OpenSSH_3.0*,"
+                  "OpenSSH_3.1*",       SSH_BUG_EXTEOF},
+                { "Sun_SSH_1.0*",       SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
                 { "OpenSSH*",           0 },
                 { "*MindTerm*",         0 },
                 { "2.1.0*",             SSH_BUG_SIGBLOB|SSH_BUG_HMAC|