[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.37 and 1.37.2.2

version 1.37, 2005/07/25 11:59:39 version 1.37.2.2, 2006/10/06 03:19:32
Line 1 
Line 1 
 /*      $OpenBSD$       */  /* $OpenBSD$ */
   
 /*  /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.   * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
Line 27 
Line 27 
 #define KEX_H  #define KEX_H
   
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include "buffer.h"  
 #include "cipher.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       "diffie-hellman-group-exchange-sha1"  #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
   #define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
   
 #define COMP_NONE       0  #define COMP_NONE       0
 #define COMP_ZLIB       1  #define COMP_ZLIB       1
Line 63 
Line 61 
         KEX_DH_GRP1_SHA1,          KEX_DH_GRP1_SHA1,
         KEX_DH_GRP14_SHA1,          KEX_DH_GRP14_SHA1,
         KEX_DH_GEX_SHA1,          KEX_DH_GEX_SHA1,
           KEX_DH_GEX_SHA256,
         KEX_MAX          KEX_MAX
 };  };
   
Line 112 
Line 111 
         int     kex_type;          int     kex_type;
         Buffer  my;          Buffer  my;
         Buffer  peer;          Buffer  peer;
         int     done;          sig_atomic_t 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 127 
Line 127 
   
 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 *, BIGNUM *);  void     kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *);
   
 Newkeys *kex_get_newkeys(int);  Newkeys *kex_get_newkeys(int);
   
Line 136 
Line 136 
 void     kexgex_client(Kex *);  void     kexgex_client(Kex *);
 void     kexgex_server(Kex *);  void     kexgex_server(Kex *);
   
 u_char *  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,
     BIGNUM *, BIGNUM *, BIGNUM *);      BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
 u_char *  void
 kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,  kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
     int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);      int, u_char *, int, int, int, int, 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.37  
changed lines
  Added in v.1.37.2.2