[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.54 and 1.55

version 1.54, 2013/01/08 18:49:04 version 1.55, 2013/04/19 01:06:50
Line 37 
Line 37 
 #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"  #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
 #define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"  #define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
 #define KEX_RESUME              "resume@appgate.com"  #define KEX_RESUME              "resume@appgate.com"
 /* The following represents the family of ECDH methods */  #define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
 #define KEX_ECDH_SHA2_STEM      "ecdh-sha2-"  #define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"
   #define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"
   
 #define COMP_NONE       0  #define COMP_NONE       0
 #define COMP_ZLIB       1  #define COMP_ZLIB       1
Line 83 
Line 84 
   
 struct Enc {  struct Enc {
         char    *name;          char    *name;
         Cipher  *cipher;          const Cipher *cipher;
         int     enabled;          int     enabled;
         u_int   key_len;          u_int   key_len;
         u_int   iv_len;          u_int   iv_len;
Line 128 
Line 129 
         sig_atomic_t done;          sig_atomic_t done;
         int     flags;          int     flags;
         const EVP_MD *evp_md;          const EVP_MD *evp_md;
           int     ec_nid;
         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 138 
Line 140 
 };  };
   
 int      kex_names_valid(const char *);  int      kex_names_valid(const char *);
   char    *kex_alg_list(void);
   
 Kex     *kex_setup(char *[PROPOSAL_MAX]);  Kex     *kex_setup(char *[PROPOSAL_MAX]);
 void     kex_finish(Kex *);  void     kex_finish(Kex *);
Line 166 
Line 169 
 kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,  kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,
     char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,      char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,
     const BIGNUM *, u_char **, u_int *);      const BIGNUM *, u_char **, u_int *);
   
 int     kex_ecdh_name_to_nid(const char *);  
 const EVP_MD *kex_ecdh_name_to_evpmd(const char *);  
   
 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.54  
changed lines
  Added in v.1.55