[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.56 and 1.57

version 1.56, 2013/07/19 07:37:48 version 1.57, 2013/11/02 21:59:15
Line 40 
Line 40 
 #define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"  #define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
 #define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"  #define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"
 #define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"  #define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"
   #define KEX_CURVE25519_SHA256   "curve25519-sha256@libssh.org"
   
 #define COMP_NONE       0  #define COMP_NONE       0
 #define COMP_ZLIB       1  #define COMP_ZLIB       1
Line 71 
Line 72 
         KEX_DH_GEX_SHA1,          KEX_DH_GEX_SHA1,
         KEX_DH_GEX_SHA256,          KEX_DH_GEX_SHA256,
         KEX_ECDH_SHA2,          KEX_ECDH_SHA2,
           KEX_C25519_SHA256,
         KEX_MAX          KEX_MAX
 };  };
   
Line 158 
Line 160 
 void     kexgex_server(Kex *);  void     kexgex_server(Kex *);
 void     kexecdh_client(Kex *);  void     kexecdh_client(Kex *);
 void     kexecdh_server(Kex *);  void     kexecdh_server(Kex *);
   void     kexc25519_client(Kex *);
   void     kexc25519_server(Kex *);
   
 void  void
 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,  kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
Line 170 
Line 174 
 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 *);
   void
   kex_c25519_hash(const EVP_MD *, char *, char *, char *, int,
       char *, int, u_char *, int, const u_char *, const u_char *,
       const BIGNUM *, u_char **, u_int *);
   
   #define CURVE25519_SIZE 32
   void    kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE])
           __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
           __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
   BIGNUM *kexc25519_shared_key(const u_char[CURVE25519_SIZE],
       const u_char[CURVE25519_SIZE])
           __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
           __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
   
 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.56  
changed lines
  Added in v.1.57