[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.64 and 1.65

version 1.64, 2014/05/02 03:27:54 version 1.65, 2015/01/13 19:31:40
Line 26 
Line 26 
 #ifndef KEX_H  #ifndef KEX_H
 #define KEX_H  #define KEX_H
   
 #include <openssl/evp.h>  #include "mac.h"
 #include <openssl/hmac.h>  
 #include <openssl/ec.h>  
   
 #define KEX_COOKIE_LEN  16  #define KEX_COOKIE_LEN  16
   
Line 79 
Line 77 
 #define KEX_INIT_SENT   0x0001  #define KEX_INIT_SENT   0x0001
   
 typedef struct Kex Kex;  typedef struct Kex Kex;
 typedef struct Mac Mac;  
 typedef struct Comp Comp;  typedef struct Comp Comp;
   typedef struct sshmac Mac;
 typedef struct Enc Enc;  typedef struct Enc Enc;
 typedef struct Newkeys Newkeys;  typedef struct Newkeys Newkeys;
   
Line 93 
Line 91 
         u_int   block_size;          u_int   block_size;
         u_char  *key;          u_char  *key;
         u_char  *iv;          u_char  *iv;
 };  
 struct Mac {  
         char    *name;  
         int     enabled;  
         u_int   mac_len;  
         u_char  *key;  
         u_int   key_len;  
         int     type;  
         int     etm;            /* Encrypt-then-MAC */  
         struct ssh_hmac_ctx     *hmac_ctx;  
         struct umac_ctx         *umac_ctx;  
 };  };
 struct Comp {  struct Comp {
         int     type;          int     type;

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65