merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

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

diff --git a/openssh/kex.h b/openssh/kex.h
index 8e29c90e9025d168978c12504590801e6329d4d7..6100df8d86b2fe8918044d7a72d6793c6f54536c 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -64,6 +64,9 @@ enum kex_exchange {
        KEX_DH_GRP14_SHA1,
        KEX_DH_GEX_SHA1,
        KEX_DH_GEX_SHA256,
+       KEX_GSS_GRP1_SHA1,
+       KEX_GSS_GRP14_SHA1,
+       KEX_GSS_GEX_SHA1,
        KEX_MAX
 };
 
@@ -105,6 +108,7 @@ struct Newkeys {
        Mac     mac;
        Comp    comp;
 };
+
 struct Kex {
        u_char  *session_id;
        u_int   session_id_len;
@@ -119,6 +123,12 @@ struct Kex {
        sig_atomic_t done;
        int     flags;
        const EVP_MD *evp_md;
+#ifdef GSSAPI
+       int     gss_deleg_creds;
+       int     gss_trust_dns;
+       char    *gss_host;
+       char    *gss_client;
+#endif
        char    *client_version_string;
        char    *server_version_string;
        int     (*verify_host_key)(Key *);
@@ -127,6 +137,8 @@ struct Kex {
        void    (*kex[KEX_MAX])(Kex *);
 };
 
+void kex_prop2buf(Buffer *, char *proposal[PROPOSAL_MAX]);
+
 Kex    *kex_setup(char *[PROPOSAL_MAX]);
 void    kex_finish(Kex *);
 
@@ -141,6 +153,11 @@ void        kexdh_server(Kex *);
 void    kexgex_client(Kex *);
 void    kexgex_server(Kex *);
 
+#ifdef GSSAPI
+void   kexgss_client(Kex *);
+void   kexgss_server(Kex *);
+#endif
+
 void
 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);