- (djm) Sync with OpenBSD:

   - markus@cvs.openbsd.org  2000/10/16 15:46:32
     [ssh.1]
     fixes from pekkas@netcore.fi
   - markus@cvs.openbsd.org  2000/10/17 14:28:11
     [atomicio.c]
     return number of characters processed; ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:04:02
     [atomicio.c]
     undo
   - markus@cvs.openbsd.org  2000/10/18 12:23:02
     [scp.c]
     replace atomicio(read,...) with read(); ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:42:00
     [session.c]
     restore old record login behaviour
   - deraadt@cvs.openbsd.org 2000/10/19 10:41:13
     [auth-skey.c]
     fmt string problem in unused code
   - provos@cvs.openbsd.org  2000/10/19 10:45:16
     [sshconnect2.c]
     don't reference freed memory. okay deraadt@
   - markus@cvs.openbsd.org  2000/10/21 11:04:23
     [canohost.c]
     typo, eramore@era-t.ericsson.se; ok niels@
   - markus@cvs.openbsd.org  2000/10/23 13:31:55
     [cipher.c]
     non-alignment dependent swap_bytes(); from
     simonb@wasabisystems.com/netbsd
   - markus@cvs.openbsd.org  2000/10/26 12:38:28
     [compat.c]
     add older vandyke products
   - markus@cvs.openbsd.org  2000/10/27 01:32:19
     [channels.c channels.h clientloop.c serverloop.c session.c]
     [ssh.c util.c]
     enable non-blocking IO on channels, and tty's (except for the
     client ttys).
   - markus@cvs.openbsd.org  2000/10/27 01:48:22
     channels.c channels.h clientloop.c
     deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com

1 files changed, 5 insertions, 2 deletions

diff --git a/compat.c b/compat.c
index 49bc0519a..a4e05ebf1 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.25 2000/10/14 12:16:56 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.26 2000/10/26 18:38:28 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -72,7 +72,10 @@ compat_datafellows(const char *version)
                                         SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD },
                 { "^2\\.[23]\\.0 ",     SSH_BUG_HMAC},
                 { "^2\\.[2-9]\\.",      0 },
-                { "^2\\.",              SSH_BUG_HMAC},          /* XXX fallback */
+                { "^2\\.4$",            SSH_OLD_SESSIONID}, /* Van Dyke */
+                { "^3\\.0 SecureCRT",   SSH_OLD_SESSIONID},
+                { "^1\\.7 SecureFX",    SSH_OLD_SESSIONID},
+                { "^2\\.",              SSH_BUG_HMAC},  /* XXX fallback */
                 { NULL,                 0 }
         };
         /* process table, return first match */