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

Diff for /src/usr.bin/ssh/kex.h between version 1.35.4.2 and 1.36

version 1.35.4.2, 2006/02/03 02:53:44 version 1.36, 2005/06/17 02:44:32
Line 31 
Line 31 
 #include "cipher.h"  #include "cipher.h"
 #include "key.h"  #include "key.h"
   
 #define KEX_DH1                 "diffie-hellman-group1-sha1"  #define KEX_DH1         "diffie-hellman-group1-sha1"
 #define KEX_DH14                "diffie-hellman-group14-sha1"  #define KEX_DH14        "diffie-hellman-group14-sha1"
 #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"  #define KEX_DHGEX       "diffie-hellman-group-exchange-sha1"
   
 #define COMP_NONE       0  
 #define COMP_ZLIB       1  
 #define COMP_DELAYED    2  
   
 enum kex_init_proposals {  enum kex_init_proposals {
         PROPOSAL_KEX_ALGS,          PROPOSAL_KEX_ALGS,
         PROPOSAL_SERVER_HOST_KEY_ALGS,          PROPOSAL_SERVER_HOST_KEY_ALGS,
Line 114 
Line 110 
         Buffer  peer;          Buffer  peer;
         int     done;          int     done;
         int     flags;          int     flags;
         const EVP_MD *evp_md;  
         char    *client_version_string;          char    *client_version_string;
         char    *server_version_string;          char    *server_version_string;
         int     (*verify_host_key)(Key *);          int     (*verify_host_key)(Key *);
Line 128 
Line 123 
   
 void     kex_send_kexinit(Kex *);  void     kex_send_kexinit(Kex *);
 void     kex_input_kexinit(int, u_int32_t, void *);  void     kex_input_kexinit(int, u_int32_t, void *);
 void     kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *);  void     kex_derive_keys(Kex *, u_char *, BIGNUM *);
   
 Newkeys *kex_get_newkeys(int);  Newkeys *kex_get_newkeys(int);
   
Line 137 
Line 132 
 void     kexgex_client(Kex *);  void     kexgex_client(Kex *);
 void     kexgex_server(Kex *);  void     kexgex_server(Kex *);
   
 void  u_char *
 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,  kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);      BIGNUM *, BIGNUM *, BIGNUM *);
 void  u_char *
 kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,  kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
     int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,      int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
     BIGNUM *, BIGNUM *, u_char **, u_int *);  
   
 void  void
 derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);  derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);

Legend:
Removed from v.1.35.4.2  
changed lines
  Added in v.1.36