remove acconfig.h

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 437735047302ddec4f671fa7743a1648560cf945..3024a27172eae078da61dbe08e705a3c1e03732f 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.34 2004/05/21 08:43:03 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_MAX
 };
@@ -81,9 +87,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;
@@ -99,7 +105,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;