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

Diff for /src/usr.bin/ssh/kex.c between version 1.134 and 1.135

version 1.134, 2017/06/13 12:13:59 version 1.135, 2018/01/23 05:27:21
Line 661 
Line 661 
                 free(name);                  free(name);
                 return SSH_ERR_INTERNAL_ERROR;                  return SSH_ERR_INTERNAL_ERROR;
         }          }
         /* truncate the key */  
         if (ssh->compat & SSH_BUG_HMAC)  
                 mac->key_len = 16;  
         mac->name = name;          mac->name = name;
         mac->key = NULL;          mac->key = NULL;
         mac->enabled = 0;          mac->enabled = 0;
Line 852 
Line 849 
         kex->dh_need = dh_need;          kex->dh_need = dh_need;
   
         /* ignore the next message if the proposals do not match */          /* ignore the next message if the proposals do not match */
         if (first_kex_follows && !proposals_match(my, peer) &&          if (first_kex_follows && !proposals_match(my, peer))
             !(ssh->compat & SSH_BUG_FIRSTKEX))  
                 ssh->dispatch_skip_packets = 1;                  ssh->dispatch_skip_packets = 1;
         r = 0;          r = 0;
  out:   out:
Legend:
Removed from v.1.134  
changed lines
  Added in v.1.135