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

Diff for /src/usr.bin/ssh/kex.c between version 1.60.2.1 and 1.61

version 1.60.2.1, 2005/09/02 03:45:00 version 1.61, 2005/06/17 02:44:32
Line 275 
Line 275 
         char *name = match_list(client, server, NULL);          char *name = match_list(client, server, NULL);
         if (name == NULL)          if (name == NULL)
                 fatal("no matching comp found: client %s server %s", client, server);                  fatal("no matching comp found: client %s server %s", client, server);
         if (strcmp(name, "zlib@openssh.com") == 0) {          if (strcmp(name, "zlib") == 0) {
                 comp->type = COMP_DELAYED;                  comp->type = 1;
         } else if (strcmp(name, "zlib") == 0) {  
                 comp->type = COMP_ZLIB;  
         } else if (strcmp(name, "none") == 0) {          } else if (strcmp(name, "none") == 0) {
                 comp->type = COMP_NONE;                  comp->type = 0;
         } else {          } else {
                 fatal("unsupported comp %s", name);                  fatal("unsupported comp %s", name);
         }          }
Line 394 
Line 392 
   
         /* ignore the next message if the proposals do not match */          /* ignore the next message if the proposals do not match */
         if (first_kex_follows && !proposals_match(my, peer) &&          if (first_kex_follows && !proposals_match(my, peer) &&
             !(datafellows & SSH_BUG_FIRSTKEX)) {             !(datafellows & SSH_BUG_FIRSTKEX)) {
                 type = packet_read();                  type = packet_read();
                 debug2("skipping next packet (type %u)", type);                  debug2("skipping next packet (type %u)", type);
         }          }
Line 413 
Line 411 
         u_int have;          u_int have;
         int mdsz = EVP_MD_size(evp_md);          int mdsz = EVP_MD_size(evp_md);
         u_char *digest;          u_char *digest;
   
         if (mdsz < 0)          if (mdsz < 0)
                 fatal("derive_key: mdsz < 0");                  fatal("derive_key: mdsz < 0");
         digest = xmalloc(roundup(need, mdsz));          digest = xmalloc(roundup(need, mdsz));
Legend:
Removed from v.1.60.2.1  
changed lines
  Added in v.1.61