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 c024402af2b94a3354ceca5496d35481726cf1df..6100df8d86b2fe8918044d7a72d6793c6f54536c 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kex.h,v 1.46 2007/06/07 19:37:34 pvalchev Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -28,6 +28,7 @@
 
 #include <signal.h>
 #include <openssl/evp.h>
+#include <openssl/hmac.h>
 
 #define        KEX_DH1                 "diffie-hellman-group1-sha1"
 #define        KEX_DH14                "diffie-hellman-group14-sha1"
@@ -89,10 +90,13 @@ struct Enc {
 struct Mac {
        char    *name;
        int     enabled;
-       const EVP_MD    *md;
        u_int   mac_len;
        u_char  *key;
        u_int   key_len;
+       int     type;
+       const EVP_MD    *evp_md;
+       HMAC_CTX        evp_ctx;
+       struct umac_ctx *umac_ctx;
 };
 struct Comp {
        int     type;
@@ -123,6 +127,7 @@ struct Kex {
        int     gss_deleg_creds;
        int     gss_trust_dns;
        char    *gss_host;
+       char    *gss_client;
 #endif
        char    *client_version_string;
        char    *server_version_string;