[BACK]Return to compat.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/compat.c between version 1.13.2.5 and 1.14

version 1.13.2.5, 2001/03/21 18:52:42 version 1.14, 2000/05/22 18:42:01
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.   * Copyright (c) 1999 Markus Friedl.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 9 
Line 9 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    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   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 23 
Line 28 
  */   */
   
 #include "includes.h"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$Id$");
   
 #include <regex.h>  #include "ssh.h"
   
 #include "packet.h"  #include "packet.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "compat.h"  #include "compat.h"
 #include "log.h"  
   
 int compat13 = 0;  int compat13 = 0;
 int compat20 = 0;  int compat20 = 0;
Line 52 
Line 55 
 void  void
 compat_datafellows(const char *version)  compat_datafellows(const char *version)
 {  {
         int i, ret;          int i;
         char ebuf[1024];          size_t len;
         regex_t reg;          struct {
         static struct {                  char    *version;
                 char    *pat;  
                 int     bugs;                  int     bugs;
         } check[] = {          } check[] = {
                 { "^OpenSSH[-_]2\\.[012]",                  {"2.1.0",       SSH_BUG_SIGBLOB|SSH_BUG_HMAC},
                                         SSH_OLD_SESSIONID|SSH_BUG_BANNER },                  {"2.0.1",       SSH_BUG_SIGBLOB|SSH_BUG_HMAC|SSH_BUG_PUBKEYAUTH|SSH_BUG_X11FWD},
                 { "^OpenSSH_2\\.3\\.0", SSH_BUG_BANNER },                  {NULL,          0}
                 { "^OpenSSH",           0 },  
                 { "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_PKOK },  
                 { "^2\\.0\\.",          SSH_BUG_SIGBLOB|SSH_BUG_HMAC|  
                                         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\\.[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 },  
                 { "^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 },  
                 { "^SSH_Version_Mapper",  
                                         SSH_BUG_SCANNER },  
                 { NULL,                 0 }  
         };          };
         /* process table, return first match */          for (i = 0; check[i].version; i++) {
         for (i = 0; check[i].pat; i++) {                  len = strlen(check[i].version);
                 ret = regcomp(&reg, check[i].pat, REG_EXTENDED|REG_NOSUB);                  if (strlen(version) >= len &&
                 if (ret != 0) {                     (strncmp(version, check[i].version, len) == 0)) {
                         regerror(ret, &reg, ebuf, sizeof(ebuf));                          verbose("datafellows: %.200s", version);
                         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", version, check[i].pat);  
                         datafellows = check[i].bugs;                          datafellows = check[i].bugs;
                         return;                          return;
                 }                  }
         }          }
         debug("no match: %s", version);  
 }  }
   
 #define SEP     ","  #define SEP     ","
 int  int
 proto_spec(const char *spec)  proto_spec(const char *spec)
 {  {
         char *s, *p, *q;          char *s, *p;
         int ret = SSH_PROTO_UNKNOWN;          int ret = SSH_PROTO_UNKNOWN;
   
         if (spec == NULL)          if (spec == NULL)
                 return ret;                  return ret;
         q = s = xstrdup(spec);          s = xstrdup(spec);
         for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {          for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) {
                 switch(atoi(p)) {                  switch(atoi(p)) {
                 case 1:                  case 1:
                         if (ret == SSH_PROTO_UNKNOWN)                          if (ret == SSH_PROTO_UNKNOWN)
Legend:
Removed from v.1.13.2.5  
changed lines
  Added in v.1.14