[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.132 and 1.133

version 1.132, 2017/04/30 23:10:43 version 1.133, 2017/05/30 14:23:52
Line 52 
Line 52 
   
 /* prototype */  /* prototype */
 static int kex_choose_conf(struct ssh *);  static int kex_choose_conf(struct ssh *);
 static int kex_input_newkeys(int, u_int32_t, void *);  static int kex_input_newkeys(int, u_int32_t, struct ssh *);
   
 static const char *proposal_names[PROPOSAL_MAX] = {  static const char *proposal_names[PROPOSAL_MAX] = {
         "KEX algorithms",          "KEX algorithms",
Line 303 
Line 303 
   
 /* ARGSUSED */  /* ARGSUSED */
 static int  static int
 kex_protocol_error(int type, u_int32_t seq, void *ctxt)  kex_protocol_error(int type, u_int32_t seq, struct ssh *ssh)
 {  {
         struct ssh *ssh = active_state; /* XXX */  
         int r;          int r;
   
         error("kex protocol error: type %d seq %u", type, seq);          error("kex protocol error: type %d seq %u", type, seq);
Line 363 
Line 362 
 }  }
   
 int  int
 kex_input_ext_info(int type, u_int32_t seq, void *ctxt)  kex_input_ext_info(int type, u_int32_t seq, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         struct kex *kex = ssh->kex;          struct kex *kex = ssh->kex;
         u_int32_t i, ninfo;          u_int32_t i, ninfo;
         char *name, *val, *found;          char *name, *val, *found;
Line 402 
Line 400 
 }  }
   
 static int  static int
 kex_input_newkeys(int type, u_int32_t seq, void *ctxt)  kex_input_newkeys(int type, u_int32_t seq, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         struct kex *kex = ssh->kex;          struct kex *kex = ssh->kex;
         int r;          int r;
   
Line 455 
Line 452 
   
 /* ARGSUSED */  /* ARGSUSED */
 int  int
 kex_input_kexinit(int type, u_int32_t seq, void *ctxt)  kex_input_kexinit(int type, u_int32_t seq, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         struct kex *kex = ssh->kex;          struct kex *kex = ssh->kex;
         const u_char *ptr;          const u_char *ptr;
         u_int i;          u_int i;
Legend:
Removed from v.1.132  
changed lines
  Added in v.1.133