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

Diff for /src/usr.bin/ssh/monitor.c between version 1.68 and 1.69

version 1.68, 2006/02/20 17:02:44 version 1.69, 2006/03/07 09:07:40
Line 479 
Line 479 
         keyid = buffer_get_int(m);          keyid = buffer_get_int(m);
         p = buffer_get_string(m, &datlen);          p = buffer_get_string(m, &datlen);
   
         if (datlen != 20)          /*
            * Supported KEX types will only return SHA1 (20 byte) or
            * SHA256 (32 byte) hashes
            */
           if (datlen != 20 && datlen != 32)
                 fatal("%s: data length incorrect: %u", __func__, datlen);                  fatal("%s: data length incorrect: %u", __func__, datlen);
   
         /* save session id, it will be passed on the first call */          /* save session id, it will be passed on the first call */
Line 1381 
Line 1385 
         kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;          kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;          kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;          kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
           kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
         kex->server = 1;          kex->server = 1;
         kex->hostkey_type = buffer_get_int(m);          kex->hostkey_type = buffer_get_int(m);
         kex->kex_type = buffer_get_int(m);          kex->kex_type = buffer_get_int(m);
Legend:
Removed from v.1.68  
changed lines
  Added in v.1.69