- (stevesk) [auth1.c] fix password auth for protocol 1 when

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 58f6d82c0b2d725bb6bf49b30aadec088123686b..2d3523a36339403db18c7da00226073942b4ddbf 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: kex.h,v 1.18 2001/04/03 19:53:29 markus Exp $ */
+/*     $OpenBSD: kex.h,v 1.30 2002/03/18 17:50:31 provos Exp $ */
 
 /*
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -59,66 +59,75 @@ enum kex_exchange {
        DH_GEX_SHA1
 };
 
+#define KEX_INIT_SENT  0x0001
+
 typedef struct Kex Kex;
 typedef struct Mac Mac;
 typedef struct Comp Comp;
 typedef struct Enc Enc;
+typedef struct Newkeys Newkeys;
 
 struct Enc {
-       char            *name;
-       Cipher          *cipher;
-       int             enabled;
+       char    *name;
+       Cipher  *cipher;
+       int     enabled;
+       u_int   key_len;
+       u_int   block_size;
        u_char  *key;
        u_char  *iv;
 };
 struct Mac {
-       char            *name;
-       int             enabled;
-       EVP_MD          *md;
-       int             mac_len;
+       char    *name;
+       int     enabled;
+       EVP_MD  *md;
+       int     mac_len;
        u_char  *key;
-       int             key_len;
+       int     key_len;
 };
 struct Comp {
-       int             type;
-       int             enabled;
-       char            *name;
+       int     type;
+       int     enabled;
+       char    *name;
+};
+struct Newkeys {
+       Enc     enc;
+       Mac     mac;
+       Comp    comp;
 };
-#define KEX_INIT_SENT  0x0001
 struct Kex {
-       Enc             enc [MODE_MAX];
-       Mac             mac [MODE_MAX];
-       Comp            comp[MODE_MAX];
-       int             we_need;
-       int             server;
-       char            *name;
-       int             hostkey_type;
-       int             kex_type;
+       u_char  *session_id;
+       int     session_id_len;
+       Newkeys *newkeys[MODE_MAX];
+       int     we_need;
+       int     server;
+       char    *name;
+       int     hostkey_type;
+       int     kex_type;
+       Buffer  my;
+       Buffer  peer;
+       int     done;
+       int     flags;
+       char    *client_version_string;
+       char    *server_version_string;
+       int     (*verify_host_key)(Key *);
+       Key     *(*load_host_key)(int);
+       int     (*host_key_index)(Key *);
+};
 
-       /* used during kex */
-       Buffer          my;
-       Buffer          peer;
-       int             newkeys;
-       int             flags;
-       void            *state;
-       char            *client_version_string;
-       char            *server_version_string;
+Kex    *kex_setup(char *[PROPOSAL_MAX]);
+void    kex_finish(Kex *);
 
-       int             (*check_host_key)(Key *hostkey);
-       Key             *(*load_host_key)(int type);
-};
+void    kex_send_kexinit(Kex *);
+void    kex_input_kexinit(int, u_int32_t, void *);
+void    kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
-void   kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
-void   packet_set_kex(Kex *k);
-Kex    *kex_start(char *proposal[PROPOSAL_MAX]);
-void   kex_send_newkeys(void);
-void   kex_protocol_error(int type, int plen, void *ctxt);
+void    kexdh(Kex *);
+void    kexgex(Kex *);
 
-void   kexdh(Kex *);
-void   kexgex(Kex *);
+Newkeys *kex_get_newkeys(int);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
-void   dump_digest(char *msg, u_char *digest, int len);
+void   dump_digest(char *, u_char *, int);
 #endif
 
 #endif