[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.274 and 1.275

version 1.274, 2018/07/06 09:06:14 version 1.275, 2018/07/09 13:37:10
Line 868 
Line 868 
         /* explicit_bzero(enc->iv,  enc->block_size);          /* explicit_bzero(enc->iv,  enc->block_size);
            explicit_bzero(enc->key, enc->key_len);             explicit_bzero(enc->key, enc->key_len);
            explicit_bzero(mac->key, mac->key_len); */             explicit_bzero(mac->key, mac->key_len); */
         if (comp->type == COMP_ZLIB && state->after_authentication          if ((comp->type == COMP_ZLIB ||
             && comp->enabled == 0) {              (comp->type == COMP_DELAYED &&
                state->after_authentication)) && comp->enabled == 0) {
                 if ((r = ssh_packet_init_compression(ssh)) < 0)                  if ((r = ssh_packet_init_compression(ssh)) < 0)
                         return r;                          return r;
                 if (mode == MODE_OUT) {                  if (mode == MODE_OUT) {
Line 959 
Line 960 
   
         /*          /*
          * Remember that we are past the authentication step, so rekeying           * Remember that we are past the authentication step, so rekeying
          * with COMP_ZLIB will turn on compression immediately.           * with COMP_DELAYED will turn on compression immediately.
          */           */
         state->after_authentication = 1;          state->after_authentication = 1;
         for (mode = 0; mode < MODE_MAX; mode++) {          for (mode = 0; mode < MODE_MAX; mode++) {
Line 967 
Line 968 
                 if (state->newkeys[mode] == NULL)                  if (state->newkeys[mode] == NULL)
                         continue;                          continue;
                 comp = &state->newkeys[mode]->comp;                  comp = &state->newkeys[mode]->comp;
                 if (comp && !comp->enabled && comp->type == COMP_ZLIB) {                  if (comp && !comp->enabled && comp->type == COMP_DELAYED) {
                         if ((r = ssh_packet_init_compression(ssh)) != 0)                          if ((r = ssh_packet_init_compression(ssh)) != 0)
                                 return r;                                  return r;
                         if (mode == MODE_OUT) {                          if (mode == MODE_OUT) {
Legend:
Removed from v.1.274  
changed lines
  Added in v.1.275