- (djm) Big OpenBSD sync:

[openssh.git] / compat.c

diff --git a/compat.c b/compat.c
index e3b6db2dc332003accc1188956f4b98a5c8c49f6..19dc76d961667934c2bd2ce7a9f8f6875a03fea1 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,11 +9,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Markus Friedl.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,25 +23,25 @@
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: compat.c,v 1.24 2000/10/10 20:20:45 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
 #include "xmalloc.h"
 #include "compat.h"
+#include <regex.h>
 
 int compat13 = 0;
 int compat20 = 0;
 int datafellows = 0;
 
-void 
+void
 enable_compat20(void)
 {
        verbose("Enabling compatibility mode for protocol 2.0");
        compat20 = 1;
-       packet_set_ssh2_format();
 }
-void 
+void
 enable_compat13(void)
 {
        verbose("Enabling compatibility mode for protocol 1.3");
@@ -56,33 +51,52 @@ enable_compat13(void)
 void
 compat_datafellows(const char *version)
 {
-       int i;
-       size_t len;
-       static const char *check[] = {
-               "2.0.1",
-               "2.1.0",
-               NULL
+       int i, ret;
+       char ebuf[1024];
+       regex_t reg;
+       static struct {
+               char    *pat;
+               int     bugs;
+       } check[] = {
+               {"^.*MindTerm",         0},
+               {"^2\\.1\\.0 ",         SSH_BUG_SIGBLOB|SSH_BUG_HMAC},
+               {"^2\\.0\\.",           SSH_BUG_SIGBLOB|SSH_BUG_HMAC|SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD},
+               {"^2\\.[23]\\.0 ",      SSH_BUG_HMAC|SSH_COMPAT_SESSIONID_ENCODING},
+               {"^2\\.[2-9]\\.",       SSH_COMPAT_SESSIONID_ENCODING},
+               {"^2\\.",               SSH_BUG_HMAC|SSH_COMPAT_SESSIONID_ENCODING},
+               {NULL,                  0}
        };
-       for (i = 0; check[i]; i++) {
-               len = strlen(check[i]);
-               if (strlen(version) >= len &&
-                  (strncmp(version, check[i], len) == 0)) {
-                       verbose("datafellows: %.200s", version);
-                       datafellows = 1;
+       /* process table, return first match */
+       for (i = 0; check[i].pat; i++) {
+               ret = regcomp(&reg, check[i].pat, REG_EXTENDED|REG_NOSUB);
+               if (ret != 0) {
+                       regerror(ret, &reg, ebuf, sizeof(ebuf));
+                       ebuf[sizeof(ebuf)-1] = '\0';
+                       error("regerror: %s", ebuf);
+                       continue;
+               }
+               ret = regexec(&reg, version, 0, NULL, 0);
+               regfree(&reg);
+               if (ret == 0) {
+                       debug("match: %s pat %s\n", version, check[i].pat);
+                       datafellows = check[i].bugs;
                        return;
                }
        }
+       debug("no match: %s", version);
 }
 
 #define        SEP     ","
 int
 proto_spec(const char *spec)
 {
-       char *s = xstrdup(spec);
-       char *p;
+       char *s, *p, *q;
        int ret = SSH_PROTO_UNKNOWN;
 
-       for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) {
+       if (spec == NULL)
+               return ret;
+       q = s = xstrdup(spec);
+       for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
                switch(atoi(p)) {
                case 1:
                        if (ret == SSH_PROTO_UNKNOWN)