[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.226 and 1.227

version 1.226, 2016/01/29 05:46:01 version 1.227, 2016/02/04 23:43:48
Line 943 
Line 943 
         if (state->newkeys[mode] != NULL) {          if (state->newkeys[mode] != NULL) {
                 debug("set_newkeys: rekeying, input %llu bytes %llu blocks, "                  debug("set_newkeys: rekeying, input %llu bytes %llu blocks, "
                    "output %llu bytes %llu blocks",                     "output %llu bytes %llu blocks",
                    state->p_read.bytes, state->p_read.blocks,                     (unsigned long long)state->p_read.bytes,
                    state->p_send.bytes, state->p_send.blocks);                     (unsigned long long)state->p_read.blocks,
                      (unsigned long long)state->p_send.bytes,
                      (unsigned long long)state->p_send.blocks);
                 if ((r = cipher_cleanup(cc)) != 0)                  if ((r = cipher_cleanup(cc)) != 0)
                         return r;                          return r;
                 enc  = &state->newkeys[mode]->enc;                  enc  = &state->newkeys[mode]->enc;
Line 1012 
Line 1014 
         if (state->rekey_limit)          if (state->rekey_limit)
                 *max_blocks = MIN(*max_blocks,                  *max_blocks = MIN(*max_blocks,
                     state->rekey_limit / enc->block_size);                      state->rekey_limit / enc->block_size);
         debug("rekey after %llu blocks", *max_blocks);          debug("rekey after %llu blocks", (unsigned long long)*max_blocks);
         return 0;          return 0;
 }  }
   
Legend:
Removed from v.1.226  
changed lines
  Added in v.1.227