- tim@mindrot.org 2001/03/17 18:45:25 [compat.c]

[openssh.git] / compat.c

diff --git a/compat.c b/compat.c
index 38fc5260513d088f5781a25257cdedb82b8be09c..9d23f9a03ad8059968cb2888b05c7590fc350c9a 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.37 2001/03/08 21:42:31 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.38 2001/03/10 15:31:00 deraadt Exp $");
 
 #ifdef HAVE_LIBPCRE
 #  include <pcreposix.h>
@@ -31,7 +31,7 @@ RCSID("$OpenBSD: compat.c,v 1.37 2001/03/08 21:42:31 markus Exp $");
 #  ifdef HAVE_REGEX_H
 #    include <regex.h>
 #  else
-#    include "fake-regex.h"
+#    include "openbsd-compat/fake-regex.h"
 #  endif
 #endif /* HAVE_LIBPCRE */
 
@@ -84,13 +84,19 @@ compat_datafellows(const char *version)
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                        SSH_BUG_PKAUTH|SSH_BUG_PKOK },
-               { "^2\\.[23]\\.0",      SSH_BUG_HMAC},
+               { "^2\\.[23]\\.0",      SSH_BUG_HMAC },
                { "^2\\.[2-9]\\.",      0 },
-               { "^2\\.4$",            SSH_OLD_SESSIONID}, /* Van Dyke */
-               { "^3\\.0 SecureCRT",   SSH_OLD_SESSIONID},
-               { "^1\\.7 SecureFX",    SSH_OLD_SESSIONID},
-               { "^1\\.2\\.1[89]",     SSH_BUG_IGNOREMSG},
-               { "^1\\.2\\.2[012]",    SSH_BUG_IGNOREMSG},
+               { "^2\\.4$",            SSH_OLD_SESSIONID },    /* Van Dyke */
+               { "^3\\.0 SecureCRT",   SSH_OLD_SESSIONID },
+               { "^1\\.7 SecureFX",    SSH_OLD_SESSIONID },
+               { "^1\\.2\\.1[89]",     SSH_BUG_IGNOREMSG },
+               { "^1\\.2\\.2[012]",    SSH_BUG_IGNOREMSG },
+               { "^SSH Compatible Server",                     /* Netscreen */
+                                       SSH_BUG_PASSWORDPAD },
+               { "^OSU_0",             SSH_BUG_PASSWORDPAD },
+               { "^OSU_1\\.[0-4]",     SSH_BUG_PASSWORDPAD },
+               { "^OSU_1\\.5alpha[1-3]",
+                                       SSH_BUG_PASSWORDPAD },
                { NULL,                 0 }
        };
        /* process table, return first match */