[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.77 and 1.78

version 1.77, 2016/05/02 08:49:03 version 1.78, 2016/05/02 10:26:04
Line 37 
Line 37 
 #define KEX_COOKIE_LEN  16  #define KEX_COOKIE_LEN  16
   
 #define KEX_DH1                 "diffie-hellman-group1-sha1"  #define KEX_DH1                 "diffie-hellman-group1-sha1"
 #define KEX_DH14                "diffie-hellman-group14-sha1"  #define KEX_DH14_SHA1           "diffie-hellman-group14-sha1"
   #define KEX_DH14_SHA256         "diffie-hellman-group14-sha256"
   #define KEX_DH16_SHA512         "diffie-hellman-group16-sha512"
   #define KEX_DH18_SHA512         "diffie-hellman-group18-sha512"
 #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_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"  #define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
Line 74 
Line 77 
 enum kex_exchange {  enum kex_exchange {
         KEX_DH_GRP1_SHA1,          KEX_DH_GRP1_SHA1,
         KEX_DH_GRP14_SHA1,          KEX_DH_GRP14_SHA1,
           KEX_DH_GRP14_SHA256,
           KEX_DH_GRP16_SHA512,
           KEX_DH_GRP18_SHA512,
         KEX_DH_GEX_SHA1,          KEX_DH_GEX_SHA1,
         KEX_DH_GEX_SHA256,          KEX_DH_GEX_SHA256,
         KEX_ECDH_SHA2,          KEX_ECDH_SHA2,
Line 176 
Line 182 
 int      kexc25519_client(struct ssh *);  int      kexc25519_client(struct ssh *);
 int      kexc25519_server(struct ssh *);  int      kexc25519_server(struct ssh *);
   
 int      kex_dh_hash(const char *, const char *,  int      kex_dh_hash(int, const char *, const char *,
     const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,      const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
     const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);      const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
   

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.78