[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.14 and 1.15

version 1.14, 2002/06/04 23:05:49 version 1.15, 2002/06/19 18:01:00
Line 83 
Line 83 
         u_int ivinlen;          u_int ivinlen;
         u_char *ivout;          u_char *ivout;
         u_int ivoutlen;          u_int ivoutlen;
           u_char *ssh1key;
           u_int ssh1keylen;
         int ssh1cipher;          int ssh1cipher;
         int ssh1protoflags;          int ssh1protoflags;
         u_char *input;          u_char *input;
Line 1265 
Line 1267 
                 set_newkeys(MODE_IN);                  set_newkeys(MODE_IN);
                 set_newkeys(MODE_OUT);                  set_newkeys(MODE_OUT);
         } else {          } else {
                 u_char key[SSH_SESSION_KEY_LENGTH];  
   
                 memset(key, 'a', sizeof(key));  
                 packet_set_protocol_flags(child_state.ssh1protoflags);                  packet_set_protocol_flags(child_state.ssh1protoflags);
                 packet_set_encryption_key(key, SSH_SESSION_KEY_LENGTH,                  packet_set_encryption_key(child_state.ssh1key,
                     child_state.ssh1cipher);                      child_state.ssh1keylen, child_state.ssh1cipher);
                   xfree(child_state.ssh1key);
         }          }
   
           /* for rc4 and other stateful ciphers */
         packet_set_keycontext(MODE_OUT, child_state.keyout);          packet_set_keycontext(MODE_OUT, child_state.keyout);
         xfree(child_state.keyout);          xfree(child_state.keyout);
         packet_set_keycontext(MODE_IN, child_state.keyin);          packet_set_keycontext(MODE_IN, child_state.keyin);
Line 1358 
Line 1359 
         if (!compat20) {          if (!compat20) {
                 child_state.ssh1protoflags = buffer_get_int(&m);                  child_state.ssh1protoflags = buffer_get_int(&m);
                 child_state.ssh1cipher = buffer_get_int(&m);                  child_state.ssh1cipher = buffer_get_int(&m);
                   child_state.ssh1key = buffer_get_string(&m,
                       &child_state.ssh1keylen);
                 child_state.ivout = buffer_get_string(&m,                  child_state.ivout = buffer_get_string(&m,
                     &child_state.ivoutlen);                      &child_state.ivoutlen);
                 child_state.ivin = buffer_get_string(&m, &child_state.ivinlen);                  child_state.ivin = buffer_get_string(&m, &child_state.ivinlen);

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15