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

Diff for /src/usr.bin/ssh/packet.c between version 1.207 and 1.208

version 1.207, 2015/02/11 01:20:38 version 1.208, 2015/02/13 18:57:00
Line 179 
Line 179 
         u_int32_t rekey_limit;          u_int32_t rekey_limit;
   
         /* Time-based rekeying */          /* Time-based rekeying */
         time_t rekey_interval;  /* how often in seconds */          u_int32_t rekey_interval;       /* how often in seconds */
         time_t rekey_time;      /* time of last rekeying */          time_t rekey_time;      /* time of last rekeying */
   
         /* Session key for protocol v1 */          /* Session key for protocol v1 */
Line 2205 
Line 2205 
             (int)seconds);              (int)seconds);
         ssh->state->rekey_limit = bytes;          ssh->state->rekey_limit = bytes;
         ssh->state->rekey_interval = seconds;          ssh->state->rekey_interval = seconds;
         /*  
          * We set the time here so that in post-auth privsep slave we count  
          * from the completion of the authentication.  
          */  
         ssh->state->rekey_time = monotime();  
 }  }
   
 time_t  time_t
Line 2417 
Line 2412 
                 if ((r = kex_to_blob(m, ssh->kex)) != 0 ||                  if ((r = kex_to_blob(m, ssh->kex)) != 0 ||
                     (r = newkeys_to_blob(m, ssh, MODE_OUT)) != 0 ||                      (r = newkeys_to_blob(m, ssh, MODE_OUT)) != 0 ||
                     (r = newkeys_to_blob(m, ssh, MODE_IN)) != 0 ||                      (r = newkeys_to_blob(m, ssh, MODE_IN)) != 0 ||
                       (r = sshbuf_put_u32(m, state->rekey_limit)) != 0 ||
                       (r = sshbuf_put_u32(m, state->rekey_interval)) != 0 ||
                     (r = sshbuf_put_u32(m, state->p_send.seqnr)) != 0 ||                      (r = sshbuf_put_u32(m, state->p_send.seqnr)) != 0 ||
                     (r = sshbuf_put_u64(m, state->p_send.blocks)) != 0 ||                      (r = sshbuf_put_u64(m, state->p_send.blocks)) != 0 ||
                     (r = sshbuf_put_u32(m, state->p_send.packets)) != 0 ||                      (r = sshbuf_put_u32(m, state->p_send.packets)) != 0 ||
Line 2604 
Line 2601 
                 if ((r = kex_from_blob(m, &ssh->kex)) != 0 ||                  if ((r = kex_from_blob(m, &ssh->kex)) != 0 ||
                     (r = newkeys_from_blob(m, ssh, MODE_OUT)) != 0 ||                      (r = newkeys_from_blob(m, ssh, MODE_OUT)) != 0 ||
                     (r = newkeys_from_blob(m, ssh, MODE_IN)) != 0 ||                      (r = newkeys_from_blob(m, ssh, MODE_IN)) != 0 ||
                       (r = sshbuf_get_u32(m, &state->rekey_limit)) != 0 ||
                       (r = sshbuf_get_u32(m, &state->rekey_interval)) != 0 ||
                     (r = sshbuf_get_u32(m, &state->p_send.seqnr)) != 0 ||                      (r = sshbuf_get_u32(m, &state->p_send.seqnr)) != 0 ||
                     (r = sshbuf_get_u64(m, &state->p_send.blocks)) != 0 ||                      (r = sshbuf_get_u64(m, &state->p_send.blocks)) != 0 ||
                     (r = sshbuf_get_u32(m, &state->p_send.packets)) != 0 ||                      (r = sshbuf_get_u32(m, &state->p_send.packets)) != 0 ||
Line 2613 
Line 2612 
                     (r = sshbuf_get_u32(m, &state->p_read.packets)) != 0 ||                      (r = sshbuf_get_u32(m, &state->p_read.packets)) != 0 ||
                     (r = sshbuf_get_u64(m, &state->p_read.bytes)) != 0)                      (r = sshbuf_get_u64(m, &state->p_read.bytes)) != 0)
                         return r;                          return r;
                   /*
                    * We set the time here so that in post-auth privsep slave we
                    * count from the completion of the authentication.
                    */
                   state->rekey_time = monotime();
                 /* XXX ssh_set_newkeys overrides p_read.packets? XXX */                  /* XXX ssh_set_newkeys overrides p_read.packets? XXX */
                 if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0 ||                  if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0 ||
                     (r = ssh_set_newkeys(ssh, MODE_OUT)) != 0)                      (r = ssh_set_newkeys(ssh, MODE_OUT)) != 0)
Legend:
Removed from v.1.207  
changed lines
  Added in v.1.208