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

[openssh.git] / compat.c

diff --git a/compat.c b/compat.c
index 6e0ed65af46b5013b3cf373a30c980d7bc27ccfa..9d23f9a03ad8059968cb2888b05c7590fc350c9a 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -23,26 +23,23 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.33 2001/01/08 22:29:05 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.38 2001/03/10 15:31:00 deraadt Exp $");
 
-#include "ssh.h"
-#include "packet.h"
-#include "xmalloc.h"
-#include "compat.h"
 #ifdef HAVE_LIBPCRE
 #  include <pcreposix.h>
 #else /* Use native regex libraries */
 #  ifdef HAVE_REGEX_H
 #    include <regex.h>
 #  else
-#    ifdef HAVE_REGCOMP
-#      include "fake-regex.h"
-#    else
-#      error "No regular libraries detected.  See INSTALL file."
-#    endif
+#    include "openbsd-compat/fake-regex.h"
 #  endif
 #endif /* HAVE_LIBPCRE */
 
+#include "packet.h"
+#include "xmalloc.h"
+#include "compat.h"
+#include "log.h"
+
 int compat13 = 0;
 int compat20 = 0;
 int datafellows = 0;
@@ -77,18 +74,29 @@ compat_datafellows(const char *version)
                { "MindTerm",           0 },
                { "^2\\.1\\.0",         SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
+               { "^2\\.1 ",            SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
+                                       SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
                { "^2\\.0\\.1[3-9]",    SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                       SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },
+                                       SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
+                                       SSH_BUG_PKOK },
                { "^2\\.0\\.",          SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                        SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
-                                       SSH_BUG_PKAUTH },
-               { "^2\\.[23]\\.0",      SSH_BUG_HMAC},
+                                       SSH_BUG_PKAUTH|SSH_BUG_PKOK },
+               { "^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},
+               { "^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 */