- (tim) [configure.ac] Use the C99-conforming functions snprintf() and

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index ecf43130f9d75333fadde90af486f8cc5f139956..1fa13799d6c2dcf7d179a0c8ce2b9f87c6f319a2 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.45 2007/06/05 06:52:37 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.48 2009/10/24 11:13:54 andreas Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -30,10 +30,13 @@
 #include <openssl/evp.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        KEX_RESUME              "resume@appgate.com"
 
 #define COMP_NONE      0
 #define COMP_ZLIB      1
@@ -87,11 +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;
-       HMAC_CTX        ctx;
+       int     type;
+       const EVP_MD    *evp_md;
+       HMAC_CTX        evp_ctx;
+       struct umac_ctx *umac_ctx;
 };
 struct Comp {
        int     type;
@@ -112,6 +117,7 @@ struct Kex {
        char    *name;
        int     hostkey_type;
        int     kex_type;
+       int     roaming;
        Buffer  my;
        Buffer  peer;
        sig_atomic_t done;