Initial revision

[gssapi-openssh.git] / openssh / kex.h

diff --git a/openssh/kex.h b/openssh/kex.h
index 2bd86ade6de21d5d4fbe69ba5791106878399824..50b8659e9bb4f50a20f2ff85101f5bae27b612f7 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.30 2002/03/18 17:50:31 provos Exp $ */
+/*     $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -55,9 +55,10 @@ enum kex_modes {
 };
 
 enum kex_exchange {
-       DH_GRP1_SHA1,
-       DH_GEX_SHA1,
-       GSS_GRP1_SHA1
+       KEX_DH_GRP1_SHA1,
+       KEX_DH_GEX_SHA1,
+       KEX_GSS_GRP1_SHA1,
+       KEX_MAX
 };
 
 #define KEX_INIT_SENT  0x0001
@@ -80,7 +81,7 @@ struct Enc {
 struct Mac {
        char    *name;
        int     enabled;
-       EVP_MD  *md;
+       const EVP_MD    *md;
        int     mac_len;
        u_char  *key;
        int     key_len;
@@ -102,7 +103,7 @@ struct KexOptions {
 
 struct Kex {
        u_char  *session_id;
-       int     session_id_len;
+       u_int   session_id_len;
        Newkeys *newkeys[MODE_MAX];
        int     we_need;
        int     server;
@@ -113,13 +114,13 @@ struct Kex {
        Buffer  peer;
        int     done;
        int     flags;
-       char    *host;
        char    *client_version_string;
        char    *server_version_string;
+       struct  KexOptions options;
        int     (*verify_host_key)(Key *);
        Key     *(*load_host_key)(int);
        int     (*host_key_index)(Key *);
-       struct  KexOptions options;
+       void    (*kex[KEX_MAX])(Kex *);
 };
 
 Kex    *kex_setup(char *[PROPOSAL_MAX]);
@@ -129,13 +130,23 @@ void       kex_send_kexinit(Kex *);
 void    kex_input_kexinit(int, u_int32_t, void *);
 void    kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
-void    kexdh(Kex *);
-void    kexgex(Kex *);
+Newkeys *kex_get_newkeys(int);
+
+void    kexdh_client(Kex *);
+void    kexdh_server(Kex *);
+void    kexgex_client(Kex *);
+void    kexgex_server(Kex *);
 #ifdef GSSAPI
-void    kexgss(Kex *);
+void     kexgss_client(Kex *);
+void     kexgss_server(Kex *);
 #endif
 
-Newkeys *kex_get_newkeys(int);
+u_char *
+kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
+    BIGNUM *, BIGNUM *, BIGNUM *);
+u_char *
+kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
+    int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
 void   dump_digest(char *, u_char *, int);