- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 3024a27172eae078da61dbe08e705a3c1e03732f..1fa13799d6c2dcf7d179a0c8ce2b9f87c6f319a2 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.37 2005/07/25 11:59:39 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.48 2009/10/24 11:13:54 andreas Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,14 +26,17 @@
 #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_DH1         "diffie-hellman-group1-sha1"
-#define        KEX_DH14        "diffie-hellman-group14-sha1"
-#define        KEX_DHGEX       "diffie-hellman-group-exchange-sha1"
+#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
@@ -63,6 +66,7 @@ enum kex_exchange {
        KEX_DH_GRP1_SHA1,
        KEX_DH_GRP14_SHA1,
        KEX_DH_GEX_SHA1,
+       KEX_DH_GEX_SHA256,
        KEX_MAX
 };
 
@@ -86,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;
@@ -110,10 +117,12 @@ struct Kex {
        char    *name;
        int     hostkey_type;
        int     kex_type;
+       int     roaming;
        Buffer  my;
        Buffer  peer;
-       int     done;
+       sig_atomic_t done;
        int     flags;
+       const EVP_MD *evp_md;
        char    *client_version_string;
        char    *server_version_string;
        int     (*verify_host_key)(Key *);
@@ -127,7 +136,7 @@ void         kex_finish(Kex *);
 
 void    kex_send_kexinit(Kex *);
 void    kex_input_kexinit(int, u_int32_t, void *);
-void    kex_derive_keys(Kex *, u_char *, BIGNUM *);
+void    kex_derive_keys(Kex *, u_char *, u_int, BIGNUM *);
 
 Newkeys *kex_get_newkeys(int);
 
@@ -136,12 +145,13 @@ void       kexdh_server(Kex *);
 void    kexgex_client(Kex *);
 void    kexgex_server(Kex *);
 
-u_char *
+void
 kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    BIGNUM *, BIGNUM *, BIGNUM *);
-u_char *
-kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int,
-    int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *);
+    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 *,
+    BIGNUM *, BIGNUM *, u_char **, u_int *);
 
 void
 derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);