initialize pointers to avoid compiler warnings

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

diff --git a/openssh/kex.h b/openssh/kex.h
index 90a0a2de00a24edb7c87541a218dc42430ee375f..1cedd9963e60b331903daf911c54484eb232e22a 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */
+/*     $OpenBSD: kex.h,v 1.37 2005/07/25 11:59:39 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -32,8 +32,13 @@
 #include "key.h"
 
 #define        KEX_DH1         "diffie-hellman-group1-sha1"
+#define        KEX_DH14        "diffie-hellman-group14-sha1"
 #define        KEX_DHGEX       "diffie-hellman-group-exchange-sha1"
 
+#define COMP_NONE      0
+#define COMP_ZLIB      1
+#define COMP_DELAYED   2
+
 enum kex_init_proposals {
        PROPOSAL_KEX_ALGS,
        PROPOSAL_SERVER_HOST_KEY_ALGS,
@@ -56,6 +61,7 @@ enum kex_modes {
 
 enum kex_exchange {
        KEX_DH_GRP1_SHA1,
+       KEX_DH_GRP14_SHA1,
        KEX_DH_GEX_SHA1,
        KEX_GSS_GRP1_SHA1,
        KEX_MAX
@@ -82,9 +88,9 @@ struct Mac {
        char    *name;
        int     enabled;
        const EVP_MD    *md;
-       int     mac_len;
+       u_int   mac_len;
        u_char  *key;
-       int     key_len;
+       u_int   key_len;
 };
 struct Comp {
        int     type;
@@ -105,7 +111,7 @@ struct Kex {
        u_char  *session_id;
        u_int   session_id_len;
        Newkeys *newkeys[MODE_MAX];
-       int     we_need;
+       u_int   we_need;
        int     server;
        char    *name;
        int     hostkey_type;
@@ -114,13 +120,12 @@ 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 *);
 };
 
@@ -137,11 +142,9 @@ void        kexdh_client(Kex *);
 void    kexdh_server(Kex *);
 void    kexgex_client(Kex *);
 void    kexgex_server(Kex *);
-void    kexgex_client(Kex *);
-void    kexgex_server(Kex *);
 #ifdef GSSAPI
-void    kexgss_client(Kex *);
-void    kexgss_server(Kex *);
+void     kexgss_client(Kex *);
+void     kexgss_server(Kex *);
 #endif
 
 u_char *
@@ -150,11 +153,9 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
 u_char *
 kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
     int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
-u_char *
-#ifdef GSSAPI
-kex_gssapi_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    BIGNUM *, BIGNUM *, BIGNUM *);
-#endif
+
+void
+derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
 void   dump_digest(char *, u_char *, int);