merged OpenSSH 5.3p1 to trunk

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

diff --git a/openssh/kex.h b/openssh/kex.h
index aef11dce2f83947cd5072ee659ca5561633ecff4..eab992ddadcf264e2864c0fddb3439eb79a42ea8 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $    */
+/* $OpenBSD: kex.h,v 1.47 2009/05/27 06:34:36 andreas Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,14 +26,16 @@
 #ifndef KEX_H
 #define KEX_H
 
+#include <signal.h>
 #include <openssl/evp.h>
-#include "buffer.h"
-#include "cipher.h"
-#include "key.h"
+#include <openssl/hmac.h>
+
+#define KEX_COOKIE_LEN 16
 
 #define        KEX_DH1                 "diffie-hellman-group1-sha1"
 #define        KEX_DH14                "diffie-hellman-group14-sha1"
 #define        KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
+#define        KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
 
 #define COMP_NONE      0
 #define COMP_ZLIB      1
@@ -63,7 +65,9 @@ enum kex_exchange {
        KEX_DH_GRP1_SHA1,
        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
 };
@@ -88,10 +92,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;
@@ -104,10 +111,6 @@ struct Newkeys {
        Comp    comp;
 };
 
-struct KexOptions {
-       int     gss_deleg_creds;
-};
-
 struct Kex {
        u_char  *session_id;
        u_int   session_id_len;
@@ -119,17 +122,17 @@ struct Kex {
        int     kex_type;
        Buffer  my;
        Buffer  peer;
-       int     done;
+       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;
-       struct  KexOptions options;
        int     (*verify_host_key)(Key *);
        Key     *(*load_host_key)(int);
        int     (*host_key_index)(Key *);
@@ -162,7 +165,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
 void
 kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
-    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, 
+    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
     BIGNUM *, BIGNUM *, u_char **, u_int *);
 
 void